From 030f1c69902e6d2f3d76c5c013a2234b69442b6b Mon Sep 17 00:00:00 2001
From: zomars <zomars@me.com>
Date: Fri, 18 Nov 2022 16:36:32 -0700
Subject: [PATCH] Preparations so public API can use tRPC procedures

---
 apps/web/package.json                                     | 1 -
 packages/lib/package.json                                 | 1 +
 .../lib => packages/lib/server}/resizeBase64Image.ts      | 0
 packages/trpc/server/createContext.ts                     | 5 ++---
 packages/trpc/server/routers/viewer.tsx                   | 8 ++++----
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename {apps/web/server/lib => packages/lib/server}/resizeBase64Image.ts (100%)

diff --git a/apps/web/package.json b/apps/web/package.json
index 79d3f431cf..c24f17472a 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -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",
diff --git a/packages/lib/package.json b/packages/lib/package.json
index 5649b4679c..1ae26f8b2f 100644
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -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",
diff --git a/apps/web/server/lib/resizeBase64Image.ts b/packages/lib/server/resizeBase64Image.ts
similarity index 100%
rename from apps/web/server/lib/resizeBase64Image.ts
rename to packages/lib/server/resizeBase64Image.ts
diff --git a/packages/trpc/server/createContext.ts b/packages/trpc/server/createContext.ts
index 6086564131..50bcc5fdaa 100644
--- a/packages/trpc/server/createContext.ts
+++ b/packages/trpc/server/createContext.ts
@@ -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);
diff --git a/packages/trpc/server/routers/viewer.tsx b/packages/trpc/server/routers/viewer.tsx
index dcf83def3f..7ea4b2156e 100644
--- a/packages/trpc/server/routers/viewer.tsx
+++ b/packages/trpc/server/routers/viewer.tsx
@@ -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";