Scheduling infrastructure for absolutely everyone.
chore: tech debt clearing - `getServerSession` has a dead arg: `res` (#19053)
Benny Joof0dc3bba17ae
diff --git a/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts b/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.tsindex b3beb6ce4fb..5a8056a1899 100644--- a/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts+++ b/apps/web/lib/apps/installation/[[...step]]/getServerSideProps.ts@@ -199,7 +199,7 @@ const getAppInstallsBySlug = async (appSlug: string, userId: number, teamIds?: n};export const getServerSideProps = async (context: GetServerSidePropsContext) => {- const { req, res, query, params } = context;+ const { req, query, params } = context;let eventTypeGroups: TEventTypeGroup[] | null = null;let isOrg = false;const stepsEnum = z.enum(STEPS);@@ -207,7 +207,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>const parsedStepParam = z.coerce.string().parse(params?.step);const parsedTeamIdParam = z.coerce.number().optional().parse(query?.teamId);const _ = stepsEnum.parse(parsedStepParam);- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session?.user?.id) return { redirect: { permanent: false, destination: "/auth/login" } };const locale = await getLocale(context.req);const app = await getAppBySlug(parsedAppSlug);diff --git a/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx b/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsxindex 685e8a75431..a35d5549477 100644--- a/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx+++ b/apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx@@ -17,7 +17,7 @@ import type { inferSSRProps } from "@lib/types/inferSSRProps";export type PageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;async function getUserPageProps(context: GetServerSidePropsContext) {- const session = await getServerSession(context);+ const session = await getServerSession({ req: context.req });const { link, slug } = paramsSchema.parse(context.params);const { rescheduleUid, duration: queryDuration } = context.query;const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req);diff --git a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts b/apps/web/lib/reschedule/[uid]/getServerSideProps.tsindex ef6ac935bdb..4fe7c5a5b29 100644--- a/apps/web/lib/reschedule/[uid]/getServerSideProps.ts+++ b/apps/web/lib/reschedule/[uid]/getServerSideProps.ts@@ -23,7 +23,7 @@ const querySchema = z.object({});export async function getServerSideProps(context: GetServerSidePropsContext) {- const session = await getServerSession(context);+ const session = await getServerSession({ req: context.req });const {uid: bookingUid,diff --git a/apps/web/lib/settings/license-key/new/getServerSideProps.tsx b/apps/web/lib/settings/license-key/new/getServerSideProps.tsxindex 52d9361a5da..46ed5cbf3bd 100644--- a/apps/web/lib/settings/license-key/new/getServerSideProps.tsx+++ b/apps/web/lib/settings/license-key/new/getServerSideProps.tsx@@ -6,7 +6,6 @@ import { getOptions } from "@calcom/feature-auth/lib/next-auth-options";export const getServerSideProps = async (context: GetServerSidePropsContext) => {const session = await getServerSession({req: context.req,- res: context.res,authOptions: getOptions({getDubId: () => context.req.cookies.dub_id || context.req.cookies.dclid,}),diff --git a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsxindex 792e7e8f4f9..9f8b747898e 100644--- a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx+++ b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx@@ -46,7 +46,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {);const ssr = await ssrInit(context);- const session = await getServerSession(context);+ const session = await getServerSession({ req: context.req });let tz: string | null = null;let userTimeFormat: number | null = null;let requiresLoginToUpdate = false;diff --git a/apps/web/pages/api/auth/changepw.ts b/apps/web/pages/api/auth/changepw.tsindex 9839e64f1ea..20dc10cb9fd 100644--- a/apps/web/pages/api/auth/changepw.ts+++ b/apps/web/pages/api/auth/changepw.ts@@ -8,7 +8,7 @@ import prisma from "@calcom/prisma";import { IdentityProvider } from "@calcom/prisma/enums";export default async function handler(req: NextApiRequest, res: NextApiResponse) {- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session || !session.user || !session.user.email) {res.status(401).json({ message: "Not authenticated" });diff --git a/apps/web/pages/api/auth/two-factor/totp/disable.ts b/apps/web/pages/api/auth/two-factor/totp/disable.tsindex bcb8fbe1bbd..b72f282e42f 100644--- a/apps/web/pages/api/auth/two-factor/totp/disable.ts+++ b/apps/web/pages/api/auth/two-factor/totp/disable.ts@@ -13,7 +13,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)return res.status(405).json({ message: "Method not allowed" });}- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session) {return res.status(401).json({ message: "Not authenticated" });}diff --git a/apps/web/pages/api/auth/two-factor/totp/enable.ts b/apps/web/pages/api/auth/two-factor/totp/enable.tsindex 4dd32f0ca33..1b29b94d2cf 100644--- a/apps/web/pages/api/auth/two-factor/totp/enable.ts+++ b/apps/web/pages/api/auth/two-factor/totp/enable.ts@@ -11,7 +11,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)return res.status(405).json({ message: "Method not allowed" });}- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session) {return res.status(401).json({ message: "Not authenticated" });}diff --git a/apps/web/pages/api/auth/two-factor/totp/setup.ts b/apps/web/pages/api/auth/two-factor/totp/setup.tsindex 03eb5284ffc..29ea67469c5 100644--- a/apps/web/pages/api/auth/two-factor/totp/setup.ts+++ b/apps/web/pages/api/auth/two-factor/totp/setup.ts@@ -15,7 +15,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)return res.status(405).json({ message: "Method not allowed" });}- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session) {return res.status(401).json({ message: "Not authenticated" });}diff --git a/apps/web/pages/api/book/event.ts b/apps/web/pages/api/book/event.tsindex ef860d6177f..b772dac490b 100644--- a/apps/web/pages/api/book/event.ts+++ b/apps/web/pages/api/book/event.ts@@ -1,4 +1,4 @@-import type { NextApiRequest, NextApiResponse } from "next";+import type { NextApiRequest } from "next";import { getServerSession } from "@calcom/features/auth/lib/getServerSession";import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";@@ -8,7 +8,7 @@ import { defaultResponder } from "@calcom/lib/server";import { checkCfTurnstileToken } from "@calcom/lib/server/checkCfTurnstileToken";import { CreationSource } from "@calcom/prisma/enums";-async function handler(req: NextApiRequest & { userId?: number }, res: NextApiResponse) {+async function handler(req: NextApiRequest & { userId?: number }) {const userIp = getIP(req);if (process.env.NEXT_PUBLIC_CLOUDFLARE_USE_TURNSTILE_IN_BOOKER === "1") {@@ -23,7 +23,7 @@ async function handler(req: NextApiRequest & { userId?: number }, res: NextApiReidentifier: userIp,});- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });/* To mimic API behavior and comply with types */req.userId = session?.user?.id || -1;req.body = {diff --git a/apps/web/pages/api/book/instant-event.ts b/apps/web/pages/api/book/instant-event.tsindex 697007e7f16..c3c86cb1f41 100644--- a/apps/web/pages/api/book/instant-event.ts+++ b/apps/web/pages/api/book/instant-event.ts@@ -1,4 +1,4 @@-import type { NextApiRequest, NextApiResponse } from "next";+import type { NextApiRequest } from "next";import { getServerSession } from "@calcom/features/auth/lib/getServerSession";import handleInstantMeeting from "@calcom/features/instant-meeting/handleInstantMeeting";@@ -7,7 +7,7 @@ import getIP from "@calcom/lib/getIP";import { defaultResponder } from "@calcom/lib/server";import { CreationSource } from "@calcom/prisma/enums";-async function handler(req: NextApiRequest & { userId?: number }, res: NextApiResponse) {+async function handler(req: NextApiRequest & { userId?: number }) {const userIp = getIP(req);await checkRateLimitAndThrowError({@@ -15,7 +15,7 @@ async function handler(req: NextApiRequest & { userId?: number }, res: NextApiReidentifier: `instant.event-${userIp}`,});- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });req.userId = session?.user?.id || -1;req.body.creationSource = CreationSource.WEBAPP;const booking = await handleInstantMeeting(req);diff --git a/apps/web/pages/api/book/recurring-event.ts b/apps/web/pages/api/book/recurring-event.tsindex 3cdc3e28c3a..209c0d5a77f 100644--- a/apps/web/pages/api/book/recurring-event.ts+++ b/apps/web/pages/api/book/recurring-event.ts@@ -1,4 +1,4 @@-import type { NextApiRequest, NextApiResponse } from "next";+import type { NextApiRequest } from "next";import { getServerSession } from "@calcom/features/auth/lib/getServerSession";import { handleNewRecurringBooking } from "@calcom/features/bookings/lib/handleNewRecurringBooking";@@ -10,7 +10,7 @@ import { checkCfTurnstileToken } from "@calcom/lib/server/checkCfTurnstileToken"// @TODO: Didn't look at the contents of this function in order to not break old booking page.-async function handler(req: NextApiRequest & { userId?: number }, res: NextApiResponse) {+async function handler(req: NextApiRequest & { userId?: number }) {const userIp = getIP(req);if (process.env.NEXT_PUBLIC_CLOUDFLARE_USE_TURNSTILE_IN_BOOKER === "1") {@@ -24,7 +24,7 @@ async function handler(req: NextApiRequest & { userId?: number }, res: NextApiRerateLimitingType: "core",identifier: userIp,});- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });/* To mimic API behavior and comply with types */req.userId = session?.user?.id || -1;diff --git a/apps/web/pages/api/cancel.ts b/apps/web/pages/api/cancel.tsindex 9208efec46f..d6b78c07e9b 100644--- a/apps/web/pages/api/cancel.ts+++ b/apps/web/pages/api/cancel.ts@@ -1,11 +1,11 @@-import type { NextApiRequest, NextApiResponse } from "next";+import type { NextApiRequest } from "next";import { getServerSession } from "@calcom/features/auth/lib/getServerSession";import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";import { defaultResponder, defaultHandler } from "@calcom/lib/server";-async function handler(req: NextApiRequest & { userId?: number }, res: NextApiResponse) {- const session = await getServerSession({ req, res });+async function handler(req: NextApiRequest & { userId?: number }) {+ const session = await getServerSession({ req });/* To mimic API behavior and comply with types */req.userId = session?.user?.id || -1;return await handleCancelBooking(req);diff --git a/apps/web/pages/api/future-opt-in.ts b/apps/web/pages/api/future-opt-in.tsindex e795c35fea2..ceb7bb2eb54 100644--- a/apps/web/pages/api/future-opt-in.ts+++ b/apps/web/pages/api/future-opt-in.ts@@ -5,7 +5,7 @@ import { FUTURE_ROUTES_OVERRIDE_COOKIE_NAME as COOKIE_NAME } from "@calcom/lib/cimport { defaultHandler, defaultResponder } from "@calcom/lib/server";async function handler(req: NextApiRequest, res: NextApiResponse): Promise<void> {- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session || !session.user || !session.user.email) {res.status(401).json({ message: "Not authenticated" });diff --git a/apps/web/pages/api/generate-referral-link.ts b/apps/web/pages/api/generate-referral-link.tsindex 326874113ec..79f049e912d 100644--- a/apps/web/pages/api/generate-referral-link.ts+++ b/apps/web/pages/api/generate-referral-link.ts@@ -9,7 +9,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)return res.status(405).json({ message: "Method not allowed" });}- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session?.user?.username) {return res.status(401).json({ message: "Unauthorized" });diff --git a/apps/web/pages/api/integrations/[...args].ts b/apps/web/pages/api/integrations/[...args].tsindex 8bb1d30d9b5..4c2c343feb5 100644--- a/apps/web/pages/api/integrations/[...args].ts+++ b/apps/web/pages/api/integrations/[...args].ts@@ -45,7 +45,7 @@ const defaultIntegrationAddHandler = async ({const handler = async (req: NextApiRequest, res: NextApiResponse) => {// Check that user is authenticated- req.session = await getServerSession({ req, res });+ req.session = await getServerSession({ req });const { args, teamId } = req.query;diff --git a/apps/web/pages/api/intercom-hash.ts b/apps/web/pages/api/intercom-hash.tsindex 54f2419331c..ff2bf9bcc6a 100644--- a/apps/web/pages/api/intercom-hash.ts+++ b/apps/web/pages/api/intercom-hash.ts@@ -5,7 +5,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";import { defaultHandler } from "@calcom/lib/server";async function handler(req: NextApiRequest, res: NextApiResponse) {- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });const secret = process.env.INTERCOM_SECRET;if (!session) {diff --git a/apps/web/pages/api/me.ts b/apps/web/pages/api/me.tsindex 986fc70bcfb..cc83c44f360 100644--- a/apps/web/pages/api/me.ts+++ b/apps/web/pages/api/me.ts@@ -9,7 +9,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)const prePrismaDate = performance.now();const prisma = (await import("@calcom/prisma")).default;const preSessionDate = performance.now();- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session) return res.status(409).json({ message: "Unauthorized" });const preUserDate = performance.now();const user = await prisma.user.findUnique({ where: { id: session.user.id } });diff --git a/apps/web/pages/api/teams/googleworkspace/callback.ts b/apps/web/pages/api/teams/googleworkspace/callback.tsindex 865670b0c70..ce41d84b570 100644--- a/apps/web/pages/api/teams/googleworkspace/callback.ts+++ b/apps/web/pages/api/teams/googleworkspace/callback.ts@@ -14,7 +14,7 @@ const stateSchema = z.object({});export default async function handler(req: NextApiRequest, res: NextApiResponse) {- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session?.user?.id) {return res.status(401).json({ message: "You must be logged in to do this" });diff --git a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts b/apps/web/server/lib/[user]/[type]/getServerSideProps.tsindex 6e705590ac2..0405e79510e 100644--- a/apps/web/server/lib/[user]/[type]/getServerSideProps.ts+++ b/apps/web/server/lib/[user]/[type]/getServerSideProps.ts@@ -99,7 +99,7 @@ async function processSeatedEvent({}async function getDynamicGroupPageProps(context: GetServerSidePropsContext) {- const session = await getServerSession(context);+ const session = await getServerSession({ req: context.req });const { user: usernames, type: slug } = paramsSchema.parse(context.params);const { rescheduleUid, bookingUid } = context.query;@@ -195,7 +195,7 @@ async function getDynamicGroupPageProps(context: GetServerSidePropsContext) {}async function getUserPageProps(context: GetServerSidePropsContext) {- const session = await getServerSession(context);+ const session = await getServerSession({ req: context.req });const { user: usernames, type: slug } = paramsSchema.parse(context.params);const username = usernames[0];const { rescheduleUid, bookingUid } = context.query;diff --git a/packages/app-store/alby/pages/setup/_getServerSideProps.tsx b/packages/app-store/alby/pages/setup/_getServerSideProps.tsxindex 9e7e476237c..3e6b2d874ea 100644--- a/packages/app-store/alby/pages/setup/_getServerSideProps.tsx+++ b/packages/app-store/alby/pages/setup/_getServerSideProps.tsx@@ -11,8 +11,8 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {if (typeof ctx.params?.slug !== "string") return notFound;- const { req, res } = ctx;- const session = await getServerSession({ req, res });+ const { req } = ctx;+ const session = await getServerSession({ req });if (!session?.user?.id) {const redirect = { redirect: { permanent: false, destination: "/auth/login" } } as const;diff --git a/packages/app-store/hitpay/pages/setup/_getServerSideProps.tsx b/packages/app-store/hitpay/pages/setup/_getServerSideProps.tsxindex f56c64e9aa5..3f7130d1595 100644--- a/packages/app-store/hitpay/pages/setup/_getServerSideProps.tsx+++ b/packages/app-store/hitpay/pages/setup/_getServerSideProps.tsx@@ -11,8 +11,8 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {if (typeof ctx.params?.slug !== "string") return notFound;- const { req, res } = ctx;- const session = await getServerSession({ req, res });+ const { req } = ctx;+ const session = await getServerSession({ req });if (!session?.user?.id) {const redirect = { redirect: { permanent: false, destination: "/auth/login" } } as const;diff --git a/packages/app-store/huddle01video/api/callback.ts b/packages/app-store/huddle01video/api/callback.tsindex f4ce62616d7..87c4fe6492a 100644--- a/packages/app-store/huddle01video/api/callback.ts+++ b/packages/app-store/huddle01video/api/callback.ts@@ -8,7 +8,7 @@ import { decodeOAuthState } from "../../_utils/oauth/decodeOAuthState";import { storeHuddle01Credential } from "../utils/storage";export default async function handler(req: NextApiRequest, res: NextApiResponse) {- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });const state = decodeOAuthState(req);diff --git a/packages/app-store/pipedrive-crm/api/add.ts b/packages/app-store/pipedrive-crm/api/add.tsindex 43a22a15aba..8392cbc5b81 100644--- a/packages/app-store/pipedrive-crm/api/add.ts+++ b/packages/app-store/pipedrive-crm/api/add.ts@@ -14,7 +14,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)if (typeof appKeys.client_id === "string") client_id = appKeys.client_id;if (!client_id) return res.status(400).json({ message: "pipedrive client id missing." });// Check that user is authenticated- req.session = await getServerSession({ req, res });+ req.session = await getServerSession({ req });const { teamId } = req.query;const user = req.session?.user;if (!user) {diff --git a/packages/features/auth/lib/getServerSession.ts b/packages/features/auth/lib/getServerSession.tsindex 54e879e131c..cd89c8ba8ae 100644--- a/packages/features/auth/lib/getServerSession.ts+++ b/packages/features/auth/lib/getServerSession.ts@@ -1,5 +1,5 @@import { LRUCache } from "lru-cache";-import type { GetServerSidePropsContext, NextApiRequest, NextApiResponse } from "next";+import type { GetServerSidePropsContext, NextApiRequest } from "next";import type { AuthOptions, Session } from "next-auth";import { getToken } from "next-auth/jwt";@@ -30,7 +30,6 @@ const CACHE = new LRUCache<string, Session>({ max: 1000 });*/export async function getServerSession(options: {req: NextApiRequest | GetServerSidePropsContext["req"];- res?: NextApiResponse | GetServerSidePropsContext["res"];authOptions?: AuthOptions;}) {const { req, authOptions: { secret } = {} } = options;diff --git a/packages/features/ee/organizations/pages/organization.tsx b/packages/features/ee/organizations/pages/organization.tsxindex 5b3dceae1d8..ec94fd560ff 100644--- a/packages/features/ee/organizations/pages/organization.tsx+++ b/packages/features/ee/organizations/pages/organization.tsx@@ -4,7 +4,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";import { getFeatureFlag } from "@calcom/features/flags/server/utils";import { MembershipRole } from "@calcom/prisma/client";-export const getServerSideProps = async ({ req, res }: GetServerSidePropsContext) => {+export const getServerSideProps = async ({ req }: GetServerSidePropsContext) => {const prisma = await import("@calcom/prisma").then((mod) => mod.default);const organizationsEnabled = await getFeatureFlag(prisma, "organizations");// Check if organizations are enabled@@ -15,7 +15,7 @@ export const getServerSideProps = async ({ req, res }: GetServerSidePropsContext}// Check if logged in user has an organization assigned- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session?.user.profile?.organizationId) {return {diff --git a/packages/features/ee/organizations/pages/settings/getServerSidePropsMembers.tsx b/packages/features/ee/organizations/pages/settings/getServerSidePropsMembers.tsxindex 5e22f75810c..4b7551776a5 100644--- a/packages/features/ee/organizations/pages/settings/getServerSidePropsMembers.tsx+++ b/packages/features/ee/organizations/pages/settings/getServerSidePropsMembers.tsx@@ -7,9 +7,8 @@ export type PageProps = inferSSRProps<typeof getServerSidePropsForMembers>;export const getServerSidePropsForMembers = async function getServerSidePropsForMembers({req,- res,}: GetServerSidePropsContext) {- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session || !session.user) {return {diff --git a/packages/features/ee/teams/api/upgrade.ts b/packages/features/ee/teams/api/upgrade.tsindex 26eebe2a1aa..dacb0f17f75 100644--- a/packages/features/ee/teams/api/upgrade.ts+++ b/packages/features/ee/teams/api/upgrade.ts@@ -72,7 +72,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {if (!metadata.success) throw new HttpError({ statusCode: 400, message: "Invalid team metadata" });}- const session = await getServerSession({ req, res });+ const session = await getServerSession({ req });if (!session) return { message: "Team upgraded successfully" };diff --git a/packages/trpc/server/middlewares/sessionMiddleware.ts b/packages/trpc/server/middlewares/sessionMiddleware.tsindex 6d1bf0efc0b..71482295778 100644--- a/packages/trpc/server/middlewares/sessionMiddleware.ts+++ b/packages/trpc/server/middlewares/sessionMiddleware.ts@@ -85,9 +85,9 @@ export async function getUserFromSession(ctx: TRPCContextInner, session: Maybe<Sexport type UserFromSession = Awaited<ReturnType<typeof getUserFromSession>>;const getSession = async (ctx: TRPCContextInner) => {- const { req, res } = ctx;+ const { req } = ctx;const { getServerSession } = await import("@calcom/features/auth/lib/getServerSession");- return req ? await getServerSession({ req, res }) : null;+ return req ? await getServerSession({ req }) : null;};export const getUserSession = async (ctx: TRPCContextInner) => {