maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preparations so public API can use tRPC procedures

This commit is contained in:
zomars 2022-11-18 16:36:32 -07:00
parent b201067f86
commit 030f1c6990
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web/package.json
View File

@ -73,7 +73,6 @@
"handlebars": "^4.7.7",
"ical.js": "^1.4.0",
"ics": "^2.37.0",
"jimp": "^0.16.1",
"kbar": "^0.1.0-beta.36",
"libphonenumber-js": "^1.10.12",
"lodash": "^4.17.21",

1
packages/lib/package.json
View File

@ -19,6 +19,7 @@
"bcryptjs": "^2.4.3",
"ical.js": "^1.4.0",
"ics": "^2.37.0",
"jimp": "^0.16.1",
"next-i18next": "^11.3.0",
"react-hot-toast": "^2.3.0",
"rrule": "^2.7.1",

0
apps/web/server/lib/resizeBase64Image.ts → packages/lib/server/resizeBase64Image.ts
View File

5
packages/trpc/server/createContext.ts
View File

@ -3,7 +3,6 @@ import type { Session } from "next-auth";
import { serverSideTranslations } from "next-i18next/serverSideTranslations";
import { getSession } from "@calcom/lib/auth";
import { CAL_URL } from "@calcom/lib/constants";
import { getLocaleFromHeaders } from "@calcom/lib/i18n";
import { defaultAvatarSrc } from "@calcom/lib/profile";
import prisma from "@calcom/prisma";
@ -106,9 +105,9 @@ async function getUserFromSession({
* Creates context for an incoming request
* @link https://trpc.io/docs/context
*/
export const createContext = async ({ req }: CreateContextOptions) => {
export const createContext = async ({ req }: CreateContextOptions, sessionGetter = getSession) => {
// for API-response caching see https://trpc.io/docs/caching
const session = await getSession({ req });
const session = await sessionGetter({ req });
const user = await getUserFromSession({ session, req });
const locale = user?.locale ?? getLocaleFromHeaders(req);

8
packages/trpc/server/routers/viewer.tsx
View File

@ -1,4 +1,4 @@
import { AppCategories, BookingStatus, IdentityProvider, MembershipRole, Prisma } from "@prisma/client";
import { AppCategories, BookingStatus, IdentityProvider, Prisma } from "@prisma/client";
import _ from "lodash";
import { authenticator } from "otplib";
import z from "zod";
@ -23,18 +23,18 @@ import getStripeAppData from "@calcom/lib/getStripeAppData";
import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";
import { checkUsername } from "@calcom/lib/server/checkUsername";
import { getTranslation } from "@calcom/lib/server/i18n";
import { resizeBase64Image } from "@calcom/lib/server/resizeBase64Image";
import slugify from "@calcom/lib/slugify";
import {
deleteWebUser as syncServicesDeleteWebUser,
updateWebUser as syncServicesUpdateWebUser,
} from "@calcom/lib/sync/SyncServiceManager";
import prisma, { baseEventTypeSelect, baseUserSelect, bookingMinimalSelect } from "@calcom/prisma";
import prisma, { bookingMinimalSelect } from "@calcom/prisma";
import { EventTypeMetaDataSchema, userMetadata } from "@calcom/prisma/zod-utils";
import { resizeBase64Image } from "@calcom/web/server/lib/resizeBase64Image";
import { TRPCError } from "@trpc/server";
import { router, publicProcedure, authedProcedure, mergeRouters } from "../trpc";
import { authedProcedure, mergeRouters, publicProcedure, router } from "../trpc";
import { apiKeysRouter } from "./viewer/apiKeys";
import { authRouter } from "./viewer/auth";
import { availabilityRouter } from "./viewer/availability";