Scheduling infrastructure for absolutely everyone.
perf: Slim down loggedInViewer tRPC router (#20111)
Keith Williams20d6eb52007e
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsxindex 6986fcfc0d4..404928dc8fc 100644--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx@@ -174,7 +174,7 @@ const organizationAdminKeys = [const useTabs = ({ isDelegationCredentialEnabled }: { isDelegationCredentialEnabled: boolean }) => {const session = useSession();- const { data: user } = trpc.viewer.me.useQuery({ includePasswordAdded: true });+ const { data: user } = trpc.viewer.me.get.useQuery({ includePasswordAdded: true });const orgBranding = useOrgBranding();const isAdmin = session.data?.user.role === UserPermissionRole.ADMIN;const isOrgAdminOrOwner =diff --git a/apps/web/components/I18nLanguageHandler.tsx b/apps/web/components/I18nLanguageHandler.tsxindex 29ffcd97d93..746096903d9 100644--- a/apps/web/components/I18nLanguageHandler.tsx+++ b/apps/web/components/I18nLanguageHandler.tsx@@ -2,7 +2,7 @@ import { CALCOM_VERSION } from "@calcom/lib/constants";import { trpc } from "@calcom/trpc/react";export function useViewerI18n(locale: string) {- return trpc.viewer.public.i18n.useQuery(+ return trpc.viewer.i18n.get.useQuery({ locale, CalComVersion: CALCOM_VERSION },{/**diff --git a/apps/web/components/getting-started/steps-views/UserProfile.tsx b/apps/web/components/getting-started/steps-views/UserProfile.tsxindex 9e5f9048bbd..d09d929d617 100644--- a/apps/web/components/getting-started/steps-views/UserProfile.tsx+++ b/apps/web/components/getting-started/steps-views/UserProfile.tsx@@ -15,7 +15,7 @@ type FormData = {};const UserProfile = () => {- const [user] = trpc.viewer.me.useSuspenseQuery();+ const [user] = trpc.viewer.me.get.useSuspenseQuery();const { t } = useLocale();const avatarRef = useRef<HTMLInputElement>(null);const { setValue, handleSubmit, getValues } = useForm<FormData>({@@ -56,7 +56,7 @@ const UserProfile = () => {console.error(error);}- await utils.viewer.me.refetch();+ await utils.viewer.me.get.refetch();const redirectUrl = localStorage.getItem("onBoardingRedirect");localStorage.removeItem("onBoardingRedirect");redirectUrl ? router.push(redirectUrl) : router.push("/");diff --git a/apps/web/components/getting-started/steps-views/UserSettings.tsx b/apps/web/components/getting-started/steps-views/UserSettings.tsxindex b6ee5f39023..9b02fe75e74 100644--- a/apps/web/components/getting-started/steps-views/UserSettings.tsx+++ b/apps/web/components/getting-started/steps-views/UserSettings.tsx@@ -21,7 +21,7 @@ interface IUserSettingsProps {const UserSettings = (props: IUserSettingsProps) => {const { nextStep } = props;- const [user] = trpc.viewer.me.useSuspenseQuery();+ const [user] = trpc.viewer.me.get.useSuspenseQuery();const { t } = useLocale();const { setTimezone: setSelectedTimeZone, timezone: selectedTimeZone } = useTimePreferences();const telemetry = useTelemetry();diff --git a/apps/web/components/settings/platform/hooks/usePlatformMe.ts b/apps/web/components/settings/platform/hooks/usePlatformMe.tsindex 97e3f942e01..1daf46fb6c5 100644--- a/apps/web/components/settings/platform/hooks/usePlatformMe.ts+++ b/apps/web/components/settings/platform/hooks/usePlatformMe.ts@@ -1,7 +1,7 @@import { trpc } from "@calcom/trpc/react";export function usePlatformMe() {- const meQuery = trpc.viewer.platformMe.useQuery(undefined, {+ const meQuery = trpc.viewer.me.platformMe.useQuery(undefined, {retry(failureCount) {return failureCount > 3;},diff --git a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsxindex ecfcf456a01..63ac64022b2 100644--- a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx+++ b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx@@ -64,7 +64,7 @@ const PremiumTextfield = (props: ICustomUsernameProps) => {onErrorMutation,readonly: disabled,} = props;- const [user] = trpc.viewer.me.useSuspenseQuery();+ const [user] = trpc.viewer.me.get.useSuspenseQuery();const [usernameIsAvailable, setUsernameIsAvailable] = useState(false);const [markAsError, setMarkAsError] = useState(false);const recentAttemptPaymentStatus = searchParams?.get("recentAttemptPaymentStatus");diff --git a/apps/web/components/ui/UsernameAvailability/index.tsx b/apps/web/components/ui/UsernameAvailability/index.tsxindex 820cf123acd..e8d67a18efa 100644--- a/apps/web/components/ui/UsernameAvailability/index.tsx+++ b/apps/web/components/ui/UsernameAvailability/index.tsx@@ -47,7 +47,7 @@ export const UsernameAvailabilityField = ({onErrorMutation,}: UsernameAvailabilityFieldProps) => {const searchParams = useSearchParams();- const [user] = trpc.viewer.me.useSuspenseQuery();+ const [user] = trpc.viewer.me.get.useSuspenseQuery();const [currentUsernameState, setCurrentUsernameState] = useState(user.username || "");const { username: usernameFromQuery, setQuery: setUsernameFromQuery } = useRouterQuery("username");const { username: currentUsername, setQuery: setCurrentUsername } =diff --git a/apps/web/lib/getting-started/[[...step]]/getServerSideProps.tsx b/apps/web/lib/getting-started/[[...step]]/getServerSideProps.tsxindex bd948fcd5a0..b45b011c328 100644--- a/apps/web/lib/getting-started/[[...step]]/getServerSideProps.tsx+++ b/apps/web/lib/getting-started/[[...step]]/getServerSideProps.tsx@@ -18,7 +18,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>const ssr = await ssrInit(context);- await ssr.viewer.me.prefetch();+ await ssr.viewer.me.get.prefetch();const user = await UserRepository.findUserTeams({id: session.user.id,diff --git a/apps/web/lib/hooks/useMeQuery.ts b/apps/web/lib/hooks/useMeQuery.tsindex 3bd57168c08..d32d27ca503 100644--- a/apps/web/lib/hooks/useMeQuery.ts+++ b/apps/web/lib/hooks/useMeQuery.ts@@ -1,7 +1,7 @@import { trpc } from "@calcom/trpc/react";export function useMeQuery() {- const meQuery = trpc.viewer.me.useQuery(undefined, {+ const meQuery = trpc.viewer.me.get.useQuery(undefined, {retry(failureCount) {return failureCount > 3;},diff --git a/apps/web/modules/availability/availability-view.tsx b/apps/web/modules/availability/availability-view.tsxindex a58712b4680..49d1b665497 100644--- a/apps/web/modules/availability/availability-view.tsx+++ b/apps/web/modules/availability/availability-view.tsx@@ -27,7 +27,7 @@ export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availabconst [bulkUpdateModal, setBulkUpdateModal] = useState(false);const utils = trpc.useUtils();- const meQuery = trpc.viewer.me.useQuery();+ const meQuery = trpc.viewer.me.get.useQuery();const router = useRouter();diff --git a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsxindex 9f8b747898e..c6eaec63b35 100644--- a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx+++ b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx@@ -51,7 +51,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {let userTimeFormat: number | null = null;let requiresLoginToUpdate = false;if (session) {- const user = await ssr.viewer.me.fetch();+ const user = await ssr.viewer.me.get.fetch();tz = user.timeZone;userTimeFormat = user.timeFormat;}diff --git a/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx b/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsxindex e101727d7da..0ed64388dc9 100644--- a/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx+++ b/apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx@@ -89,7 +89,7 @@ const OnboardingPage = (props: PageProps) => {const params = useParamsWithFallback();const router = useRouter();- const [user] = trpc.viewer.me.useSuspenseQuery();+ const [user] = trpc.viewer.me.get.useSuspenseQuery();const { t } = useLocale();const result = stepRouteSchema.safeParse({diff --git a/apps/web/modules/settings/my-account/appearance-view.tsx b/apps/web/modules/settings/my-account/appearance-view.tsxindex d031f2cdabf..94b416405f9 100644--- a/apps/web/modules/settings/my-account/appearance-view.tsx+++ b/apps/web/modules/settings/my-account/appearance-view.tsx@@ -85,7 +85,7 @@ const AppearanceView = ({user,hasPaidPlan,}: {- user: RouterOutputs["viewer"]["me"];+ user: RouterOutputs["viewer"]["me"]["get"];hasPaidPlan: boolean;}) => {const { t } = useLocale();@@ -436,7 +436,7 @@ const AppearanceView = ({};const AppearancePage = () => {- const { data: user, isPending } = trpc.viewer.me.useQuery();+ const { data: user, isPending } = trpc.viewer.me.get.useQuery();const { isPending: isTeamPlanStatusLoading, hasPaidPlan } = useHasPaidPlan();if (isPending || isTeamPlanStatusLoading || !user) return <SkeletonLoader />;diff --git a/apps/web/modules/settings/my-account/general-view.tsx b/apps/web/modules/settings/my-account/general-view.tsxindex 924b3109a71..fe74d8eaca1 100644--- a/apps/web/modules/settings/my-account/general-view.tsx+++ b/apps/web/modules/settings/my-account/general-view.tsx@@ -66,7 +66,7 @@ const SkeletonLoader = () => {interface GeneralViewProps {localeProp: string;- user: RouterOutputs["viewer"]["me"];+ user: RouterOutputs["viewer"]["me"]["get"];travelSchedules: RouterOutputs["viewer"]["getTravelSchedules"];revalidatePage: GeneralQueryViewProps["revalidatePage"];}@@ -78,7 +78,7 @@ type GeneralQueryViewProps = {const GeneralQueryView = ({ revalidatePage }: GeneralQueryViewProps) => {const { t } = useLocale();- const { data: user, isPending } = trpc.viewer.me.useQuery();+ const { data: user, isPending } = trpc.viewer.me.get.useQuery();const { data: travelSchedules, isPending: isPendingTravelSchedules } =trpc.viewer.getTravelSchedules.useQuery();diff --git a/apps/web/modules/settings/my-account/profile-view.tsx b/apps/web/modules/settings/my-account/profile-view.tsxindex ae9f926a022..c4e6461281c 100644--- a/apps/web/modules/settings/my-account/profile-view.tsx+++ b/apps/web/modules/settings/my-account/profile-view.tsx@@ -95,13 +95,13 @@ const ProfileView = () => {const { t } = useLocale();const utils = trpc.useUtils();const { update } = useSession();- const { data: user, isPending } = trpc.viewer.me.useQuery({ includePasswordAdded: true });+ const { data: user, isPending } = trpc.viewer.me.get.useQuery({ includePasswordAdded: true });const updateProfileMutation = trpc.viewer.updateProfile.useMutation({onSuccess: async (res) => {await update(res);utils.viewer.me.invalidate();- utils.viewer.shouldVerifyEmail.invalidate();+ utils.viewer.me.shouldVerifyEmail.invalidate();if (res.hasEmailBeenChanged && res.sendEmailVerification) {showToast(t("change_of_email_toast", { email: tempFormValues?.email }), "success");@@ -187,14 +187,14 @@ const ProfileView = () => {setHasDeleteErrors(true);setDeleteErrorMessage(errorMessages[error.message]);};- const deleteMeMutation = trpc.viewer.deleteMe.useMutation({+ const deleteMeMutation = trpc.viewer.me.deleteMe.useMutation({onSuccess: onDeleteMeSuccessMutation,onError: onDeleteMeErrorMutation,async onSettled() {await utils.viewer.me.invalidate();},});- const deleteMeWithoutPasswordMutation = trpc.viewer.deleteMeWithoutPassword.useMutation({+ const deleteMeWithoutPasswordMutation = trpc.viewer.me.deleteMeWithoutPassword.useMutation({onSuccess: onDeleteMeSuccessMutation,onError: onDeleteMeErrorMutation,async onSettled() {@@ -511,8 +511,8 @@ const ProfileForm = ({extraField?: React.ReactNode;isPending: boolean;isFallbackImg: boolean;- user: RouterOutputs["viewer"]["me"];- userOrganization: RouterOutputs["viewer"]["me"]["organization"];+ user: RouterOutputs["viewer"]["me"]["get"];+ userOrganization: RouterOutputs["viewer"]["me"]["get"]["organization"];isCALIdentityProvider: boolean;}) => {const { t } = useLocale();diff --git a/apps/web/modules/settings/security/impersonation-view.tsx b/apps/web/modules/settings/security/impersonation-view.tsxindex 3e3d8bd287a..90dcb49cbc1 100644--- a/apps/web/modules/settings/security/impersonation-view.tsx+++ b/apps/web/modules/settings/security/impersonation-view.tsx@@ -17,7 +17,7 @@ const SkeletonLoader = () => {);};-const ProfileImpersonationView = ({ user }: { user: RouterOutputs["viewer"]["me"] }) => {+const ProfileImpersonationView = ({ user }: { user: RouterOutputs["viewer"]["me"]["get"] }) => {const { t } = useLocale();const utils = trpc.useUtils();const [disableImpersonation, setDisableImpersonation] = useState<boolean | undefined>(@@ -32,8 +32,8 @@ const ProfileImpersonationView = ({ user }: { user: RouterOutputs["viewer"]["me"utils.viewer.me.invalidate();},onMutate: async ({ disableImpersonation }) => {- await utils.viewer.me.cancel();- const previousValue = utils.viewer.me.getData();+ await utils.viewer.me.get.cancel();+ const previousValue = utils.viewer.me.get.getData();setDisableImpersonation(disableImpersonation);@@ -41,7 +41,7 @@ const ProfileImpersonationView = ({ user }: { user: RouterOutputs["viewer"]["me"},onError: (error, variables, context) => {if (context?.previousValue) {- utils.viewer.me.setData(undefined, context.previousValue);+ utils.viewer.me.get.setData(undefined, context.previousValue);setDisableImpersonation(context.previousValue?.disableImpersonation);}showToast(`${t("error")}, ${error.message}`, "error");@@ -68,7 +68,7 @@ const ProfileImpersonationView = ({ user }: { user: RouterOutputs["viewer"]["me"};const ProfileImpersonationViewWrapper = () => {- const { data: user, isPending } = trpc.viewer.me.useQuery();+ const { data: user, isPending } = trpc.viewer.me.get.useQuery();if (isPending || !user) return <SkeletonLoader />;return <ProfileImpersonationView user={user} />;diff --git a/apps/web/modules/settings/security/password-view.tsx b/apps/web/modules/settings/security/password-view.tsxindex 56975be804f..078dea5e05d 100644--- a/apps/web/modules/settings/security/password-view.tsx+++ b/apps/web/modules/settings/security/password-view.tsx@@ -33,7 +33,7 @@ type ChangePasswordSessionFormValues = {};interface PasswordViewProps {- user: RouterOutputs["viewer"]["me"];+ user: RouterOutputs["viewer"]["me"]["get"];}const SkeletonLoader = () => {@@ -72,12 +72,12 @@ const PasswordView = ({ user }: PasswordViewProps) => {utils.viewer.me.invalidate();},onMutate: async () => {- await utils.viewer.me.cancel();- const previousValue = await utils.viewer.me.getData();+ await utils.viewer.me.get.cancel();+ const previousValue = await utils.viewer.me.get.getData();const previousMetadata = userMetadataSchema.safeParse(previousValue?.metadata);if (previousValue && sessionTimeout && previousMetadata.success) {- utils.viewer.me.setData(undefined, {+ utils.viewer.me.get.setData(undefined, {...previousValue,metadata: { ...previousMetadata?.data, sessionTimeout: sessionTimeout },});@@ -86,7 +86,7 @@ const PasswordView = ({ user }: PasswordViewProps) => {},onError: (error, _, context) => {if (context?.previousValue) {- utils.viewer.me.setData(undefined, context.previousValue);+ utils.viewer.me.get.setData(undefined, context.previousValue);}showToast(`${t("session_timeout_change_error")}, ${error.message}`, "error");},@@ -305,7 +305,7 @@ const PasswordView = ({ user }: PasswordViewProps) => {};const PasswordViewWrapper = () => {- const { data: user, isPending } = trpc.viewer.me.useQuery({ includePasswordAdded: true });+ const { data: user, isPending } = trpc.viewer.me.get.useQuery({ includePasswordAdded: true });const { t } = useLocale();if (isPending || !user) return <SkeletonLoader />;diff --git a/apps/web/modules/settings/security/two-factor-auth-view.tsx b/apps/web/modules/settings/security/two-factor-auth-view.tsxindex 59a10394a00..a294f2d9450 100644--- a/apps/web/modules/settings/security/two-factor-auth-view.tsx+++ b/apps/web/modules/settings/security/two-factor-auth-view.tsx@@ -26,7 +26,7 @@ const TwoFactorAuthView = () => {const utils = trpc.useUtils();const { t } = useLocale();- const { data: user, isPending } = trpc.viewer.me.useQuery({ includePasswordAdded: true });+ const { data: user, isPending } = trpc.viewer.me.get.useQuery({ includePasswordAdded: true });const [enableModalOpen, setEnableModalOpen] = useState<boolean>(false);const [disableModalOpen, setDisableModalOpen] = useState<boolean>(false);diff --git a/apps/web/modules/teams/teams-view.tsx b/apps/web/modules/teams/teams-view.tsxindex 20b0a5cdf75..4d08d97eaa3 100644--- a/apps/web/modules/teams/teams-view.tsx+++ b/apps/web/modules/teams/teams-view.tsx@@ -8,7 +8,7 @@ import { Button } from "@calcom/ui";export const TeamsCTA = () => {const { t } = useLocale();- const [user] = trpc.viewer.me.useSuspenseQuery();+ const [user] = trpc.viewer.me.get.useSuspenseQuery();return !user.organizationId || user.organization.isOrgAdmin ? (<Buttondata-testid="new-team-btn"diff --git a/apps/web/modules/upgrade/upgrade-view.tsx b/apps/web/modules/upgrade/upgrade-view.tsxindex d698e1c2b01..d21ebe0282a 100644--- a/apps/web/modules/upgrade/upgrade-view.tsx+++ b/apps/web/modules/upgrade/upgrade-view.tsx@@ -10,7 +10,7 @@ import { Button, EmptyScreen } from "@calcom/ui";import { showToast } from "@calcom/ui";export type OrgUpgradeBannerProps = {- data: RouterOutputs["viewer"]["getUserTopBanners"]["orgUpgradeBanner"];+ data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["orgUpgradeBanner"];};export default function UpgradePage() {diff --git a/apps/web/pages/api/trpc/i18n/[trpc].ts b/apps/web/pages/api/trpc/i18n/[trpc].tsnew file mode 100644index 00000000000..905f6031835--- /dev/null+++ b/apps/web/pages/api/trpc/i18n/[trpc].ts@@ -0,0 +1,4 @@+import { createNextApiHandler } from "@calcom/trpc/server/createNextApiHandler";+import { i18nRouter } from "@calcom/trpc/server/routers/viewer/i18n/_router";++export default createNextApiHandler(i18nRouter, true, "i18n");diff --git a/apps/web/pages/api/trpc/me/[trpc].ts b/apps/web/pages/api/trpc/me/[trpc].tsnew file mode 100644index 00000000000..22f5c967695--- /dev/null+++ b/apps/web/pages/api/trpc/me/[trpc].ts@@ -0,0 +1,4 @@+import { createNextApiHandler } from "@calcom/trpc/server/createNextApiHandler";+import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";++export default createNextApiHandler(meRouter);diff --git a/apps/web/playwright/auth/forgot-password.e2e.ts b/apps/web/playwright/auth/forgot-password.e2e.tsindex ad4bf68eb41..04bc65e0113 100644--- a/apps/web/playwright/auth/forgot-password.e2e.ts+++ b/apps/web/playwright/auth/forgot-password.e2e.ts@@ -14,9 +14,11 @@ test.describe("Forgot password", async () => {// Got to reset password flowawait page.goto("/auth/forgot-password");+ await page.waitForSelector("text=Forgot Password?");await page.fill('input[name="email"]', `${user.username}@example.com`);await page.press('input[name="email"]', "Enter");+ await page.waitForLoadState("networkidle");// wait for confirm page.await page.waitForSelector("text=Reset link sent");diff --git a/apps/web/playwright/fixtures/users.ts b/apps/web/playwright/fixtures/users.tsindex c00caa9e70a..b2b3d90fda0 100644--- a/apps/web/playwright/fixtures/users.ts+++ b/apps/web/playwright/fixtures/users.ts@@ -1043,6 +1043,8 @@ export async function login(//loginawait page.goto("/");+ await page.waitForSelector("text=Welcome back");+await emailLocator.fill(user.email ?? `${user.username}@example.com`);// eslint-disable-next-line @typescript-eslint/no-non-null-assertionawait passwordLocator.fill(user.password ?? user.username!);diff --git a/apps/web/playwright/locale.e2e.ts b/apps/web/playwright/locale.e2e.tsindex 20fff1d9328..552e7b380e0 100644--- a/apps/web/playwright/locale.e2e.ts+++ b/apps/web/playwright/locale.e2e.ts@@ -19,6 +19,7 @@ test.describe("unauthorized user sees correct translations (de)", async () => {await page.locator("html[dir=ltr]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=Willkommen zurück");const locator = page.getByText("Willkommen zurück", { exact: true });expect(await locator.count()).toEqual(1);}@@ -43,6 +44,7 @@ test.describe("unauthorized user sees correct translations (ar)", async () => {await page.locator("html[dir=rtl]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=أهلاً بك من جديد");const locator = page.getByText("أهلاً بك من جديد", { exact: true });expect(await locator.count()).toEqual(1);}@@ -67,6 +69,7 @@ test.describe("unauthorized user sees correct translations (zh)", async () => {await page.locator("html[dir=ltr]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=欢迎回来");const locator = page.getByText("欢迎回来", { exact: true });expect(await locator.count()).toEqual(1);}@@ -91,6 +94,7 @@ test.describe("unauthorized user sees correct translations (zh-CN)", async () =>await page.locator("html[dir=ltr]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=欢迎回来");const locator = page.getByText("欢迎回来", { exact: true });expect(await locator.count()).toEqual(1);}@@ -115,6 +119,7 @@ test.describe("unauthorized user sees correct translations (zh-TW)", async () =>await page.locator("html[dir=ltr]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=歡迎回來");const locator = page.getByText("歡迎回來", { exact: true });expect(await locator.count()).toEqual(1);}@@ -139,6 +144,7 @@ test.describe("unauthorized user sees correct translations (pt)", async () => {await page.locator("html[dir=ltr]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=Olá novamente");const locator = page.getByText("Olá novamente", { exact: true });expect(await locator.count()).toEqual(1);}@@ -163,6 +169,7 @@ test.describe("unauthorized user sees correct translations (pt-br)", async () =>await page.locator("html[dir=ltr]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=Bem-vindo(a) novamente");const locator = page.getByText("Bem-vindo(a) novamente", { exact: true });expect(await locator.count()).toEqual(1);}@@ -188,6 +195,7 @@ test.describe("unauthorized user sees correct translations (es-419)", async () =await page.locator("html[dir=ltr]").waitFor({ state: "attached" });{+ await page.waitForSelector("text=Bienvenido de nuevo");const locator = page.getByText("Bienvenido de nuevo", { exact: true });expect(await locator.count()).toEqual(1);}diff --git a/apps/web/server/lib/ssr.ts b/apps/web/server/lib/ssr.tsindex 68afe31abf4..d99fb56983e 100644--- a/apps/web/server/lib/ssr.ts+++ b/apps/web/server/lib/ssr.ts@@ -7,25 +7,21 @@ import { getLocale } from "@calcom/features/auth/lib/getLocale";import { map } from "@calcom/features/flags/server/procedures/map";import { CALCOM_VERSION } from "@calcom/lib/constants";import { createContext } from "@calcom/trpc/server/createContext";-import { me } from "@calcom/trpc/server/routers/loggedInViewer/procedures/me";import { teamsAndUserProfilesQuery } from "@calcom/trpc/server/routers/loggedInViewer/procedures/teamsAndUserProfilesQuery";import { event } from "@calcom/trpc/server/routers/publicViewer/procedures/event";import { session } from "@calcom/trpc/server/routers/publicViewer/procedures/session";import { get } from "@calcom/trpc/server/routers/viewer/eventTypes/procedures/get";+import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";import { hasTeamPlan } from "@calcom/trpc/server/routers/viewer/teams/procedures/hasTeamPlan";-import { router, mergeRouters } from "@calcom/trpc/server/trpc";+import { mergeRouters, router } from "@calcom/trpc/server/trpc";import { createServerSideHelpers } from "@trpc/react-query/server";-const loggedInRouter = router({- me,-});-// Temporary workaround for OOM issue, import only procedures that are called on the server sideconst routerSlice = router({viewer: mergeRouters(- loggedInRouter,router({+ me: meRouter,features: router({map,}),@@ -82,7 +78,7 @@ export async function ssrInit(context: GetServerSidePropsContext, options?: { no// Provides a better UX to the users who have already upgraded.ssr.viewer.teams.hasTeamPlan.prefetch(),ssr.viewer.public.session.prefetch(),- ssr.viewer.me.prefetch(),+ ssr.viewer.me.get.prefetch(),]);return ssr;diff --git a/packages/app-store/components.tsx b/packages/app-store/components.tsxindex 6cba4fb4ba8..6e52e74ccfb 100644--- a/packages/app-store/components.tsx+++ b/packages/app-store/components.tsx@@ -59,7 +59,7 @@ export const InstallAppButton = (disableInstall?: boolean;} & InstallAppButtonProps) => {- const { isPending: isUserLoading, data: user } = trpc.viewer.me.useQuery();+ const { isPending: isUserLoading, data: user } = trpc.viewer.me.get.useQuery();const router = useRouter();const proProtectionElementRef = useRef<HTMLDivElement | null>(null);const { isPending: isTeamPlanStatusLoading, hasTeamPlan } = useHasTeamPlan();diff --git a/packages/features/bookings/UnconfirmedBookingBadge.tsx b/packages/features/bookings/UnconfirmedBookingBadge.tsxindex f57fe48aadf..af693847c04 100644--- a/packages/features/bookings/UnconfirmedBookingBadge.tsx+++ b/packages/features/bookings/UnconfirmedBookingBadge.tsx@@ -6,7 +6,7 @@ import { Badge } from "@calcom/ui";export default function UnconfirmedBookingBadge() {const { t } = useLocale();- const { data: unconfirmedBookingCount } = trpc.viewer.bookingUnconfirmedCount.useQuery();+ const { data: unconfirmedBookingCount } = trpc.viewer.me.bookingUnconfirmedCount.useQuery();if (!unconfirmedBookingCount) return null;return (<Link href="/bookings/unconfirmed">diff --git a/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx b/packages/features/ee/organizations/components/OrgUpgradeBanner.tsxindex f4a5c1a7c07..f65cbba5a8f 100644--- a/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx+++ b/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx@@ -7,7 +7,7 @@ import { trpc } from "@calcom/trpc/react";import { showToast, TopBanner } from "@calcom/ui";export type OrgUpgradeBannerProps = {- data: RouterOutputs["viewer"]["getUserTopBanners"]["orgUpgradeBanner"];+ data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["orgUpgradeBanner"];};export function OrgUpgradeBanner({ data }: OrgUpgradeBannerProps) {diff --git a/packages/features/ee/organizations/pages/settings/general.tsx b/packages/features/ee/organizations/pages/settings/general.tsxindex 20f721f257b..2733032665d 100644--- a/packages/features/ee/organizations/pages/settings/general.tsx+++ b/packages/features/ee/organizations/pages/settings/general.tsx@@ -60,7 +60,7 @@ const OrgGeneralView = () => {isPending,error,} = trpc.viewer.organizations.listCurrent.useQuery(undefined, {});- const { data: user } = trpc.viewer.me.useQuery();+ const { data: user } = trpc.viewer.me.get.useQuery();useEffect(function refactorMeWithoutEffect() {diff --git a/packages/features/ee/support/lib/freshchat/FreshChatScript.tsx b/packages/features/ee/support/lib/freshchat/FreshChatScript.tsxindex 8008d7655ab..cea44925c6b 100644--- a/packages/features/ee/support/lib/freshchat/FreshChatScript.tsx+++ b/packages/features/ee/support/lib/freshchat/FreshChatScript.tsx@@ -20,7 +20,7 @@ export const isFreshChatEnabled =nonEmptySchema.safeParse(host).success && nonEmptySchema.safeParse(token).success;export default function FreshChatScript() {- const { data } = trpc.viewer.me.useQuery();+ const { data } = trpc.viewer.me.get.useQuery();return (<Scriptid="fresh-chat-sdk"diff --git a/packages/features/ee/support/lib/intercom/useIntercom.ts b/packages/features/ee/support/lib/intercom/useIntercom.tsindex 070dd5b12b4..e6d69caab8d 100644--- a/packages/features/ee/support/lib/intercom/useIntercom.ts+++ b/packages/features/ee/support/lib/intercom/useIntercom.ts@@ -25,8 +25,8 @@ const useIntercomHook = isInterComEnabledexport const useIntercom = () => {const hookData = useIntercomHook();- const { data } = trpc.viewer.me.useQuery();- const { data: statsData } = trpc.viewer.myStats.useQuery(undefined, {+ const { data } = trpc.viewer.me.get.useQuery();+ const { data: statsData } = trpc.viewer.me.myStats.useQuery(undefined, {trpc: {context: {skipBatch: true,@@ -128,8 +128,8 @@ export const useIntercom = () => {export const useBootIntercom = () => {const { boot } = useIntercom();- const { data: user } = trpc.viewer.me.useQuery();- const { data: statsData } = trpc.viewer.myStats.useQuery(undefined, {+ const { data: user } = trpc.viewer.me.get.useQuery();+ const { data: statsData } = trpc.viewer.me.myStats.useQuery(undefined, {trpc: {context: {skipBatch: true,diff --git a/packages/features/ee/teams/components/TeamList.tsx b/packages/features/ee/teams/components/TeamList.tsxindex 63d2bdaa3c8..963712bd1d2 100644--- a/packages/features/ee/teams/components/TeamList.tsx+++ b/packages/features/ee/teams/components/TeamList.tsx@@ -24,7 +24,7 @@ export default function TeamList(props: Props) {const utils = trpc.useUtils();const { t } = useLocale();- const { data: user } = trpc.viewer.me.useQuery();+ const { data: user } = trpc.viewer.me.get.useQuery();const [hideDropdown, setHideDropdown] = useState(false);diff --git a/packages/features/ee/teams/components/TeamListItem.tsx b/packages/features/ee/teams/components/TeamListItem.tsxindex ba7f43767d1..1b27ae6b7f6 100644--- a/packages/features/ee/teams/components/TeamListItem.tsx+++ b/packages/features/ee/teams/components/TeamListItem.tsx@@ -46,7 +46,7 @@ export default function TeamListItem(props: Props) {const searchParams = useCompatSearchParams();const { t } = useLocale();const utils = trpc.useUtils();- const user = trpc.viewer.me.useQuery().data;+ const user = trpc.viewer.me.get.useQuery().data;const team = props.team;const showDialog = searchParams?.get("inviteModal") === "true";diff --git a/packages/features/ee/teams/components/TeamsListing.tsx b/packages/features/ee/teams/components/TeamsListing.tsxindex c73956bcfbb..0651c6c09f3 100644--- a/packages/features/ee/teams/components/TeamsListing.tsx+++ b/packages/features/ee/teams/components/TeamsListing.tsx@@ -30,7 +30,7 @@ export function TeamsListing() {});- const { data: user } = trpc.viewer.me.useQuery();+ const { data: user } = trpc.viewer.me.get.useQuery();const { mutate: inviteMemberByToken } = trpc.viewer.teams.inviteMemberByToken.useMutation({onSuccess: (teamName) => {diff --git a/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx b/packages/features/ee/teams/components/TeamsUpgradeBanner.tsxindex 2804d59a2fa..07cb8db44fe 100644--- a/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx+++ b/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx@@ -6,7 +6,7 @@ import type { RouterOutputs } from "@calcom/trpc/react";import { showToast, TopBanner } from "@calcom/ui";export type TeamsUpgradeBannerProps = {- data: RouterOutputs["viewer"]["getUserTopBanners"]["teamUpgradeBanner"];+ data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["teamUpgradeBanner"];};export function TeamsUpgradeBanner({ data }: TeamsUpgradeBannerProps) {diff --git a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsxindex 7b60fa57712..bdc8b505eb0 100644--- a/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx+++ b/packages/features/ee/workflows/components/WorkflowDetailsPage.tsx@@ -18,7 +18,7 @@ import { AddActionDialog } from "./AddActionDialog";import { DeleteDialog } from "./DeleteDialog";import WorkflowStepContainer from "./WorkflowStepContainer";-type User = RouterOutputs["viewer"]["me"];+type User = RouterOutputs["viewer"]["me"]["get"];interface Props {form: UseFormReturn<FormValues>;diff --git a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx b/packages/features/ee/workflows/components/WorkflowStepContainer.tsxindex 7f5edb3653c..53877613d5a 100644--- a/packages/features/ee/workflows/components/WorkflowStepContainer.tsx+++ b/packages/features/ee/workflows/components/WorkflowStepContainer.tsx@@ -58,7 +58,7 @@ import { whatsappReminderTemplate } from "../lib/reminders/templates/whatsapp";import type { FormValues } from "../pages/workflow";import { TimeTimeUnitInput } from "./TimeTimeUnitInput";-type User = RouterOutputs["viewer"]["me"];+type User = RouterOutputs["viewer"]["me"]["get"];type WorkflowStepProps = {step?: WorkflowStep;diff --git a/packages/features/embed/Embed.tsx b/packages/features/embed/Embed.tsxindex a8ece973ab6..2d924332cd9 100644--- a/packages/features/embed/Embed.tsx+++ b/packages/features/embed/Embed.tsx@@ -698,7 +698,7 @@ const EmbedTypeCodeAndPreviewDialogContent = ({{ id: parsedEventId },{ enabled: !Number.isNaN(parsedEventId) && embedType === "email", refetchOnWindowFocus: false });- const { data: userSettings } = trpc.viewer.me.useQuery();+ const { data: userSettings } = trpc.viewer.me.get.useQuery();const teamSlug = !!eventTypeData?.team ? eventTypeData.team.slug : null;diff --git a/packages/features/embed/EventTypeEmbed.tsx b/packages/features/embed/EventTypeEmbed.tsxindex c74408388e6..b71beea49fa 100644--- a/packages/features/embed/EventTypeEmbed.tsx+++ b/packages/features/embed/EventTypeEmbed.tsx@@ -8,7 +8,7 @@ import { useEmbedTypes } from "./lib/hooks";export const EventTypeEmbedDialog = () => {const types = useEmbedTypes();- const { data: user } = trpc.viewer.me.useQuery();+ const { data: user } = trpc.viewer.me.get.useQuery();return (<EmbedDialogdiff --git a/packages/features/embed/RoutingFormEmbed.tsx b/packages/features/embed/RoutingFormEmbed.tsxindex f91f6bdbef2..c62de54b887 100644--- a/packages/features/embed/RoutingFormEmbed.tsx+++ b/packages/features/embed/RoutingFormEmbed.tsx@@ -8,7 +8,7 @@ import { useEmbedTypes } from "./lib/hooks";export const RoutingFormEmbedDialog = () => {const types = useEmbedTypes();- const { data: user } = trpc.viewer.me.useQuery();+ const { data: user } = trpc.viewer.me.get.useQuery();const routingFormTypes = types.filter((type) => type.type !== "email");return (<EmbedDialogdiff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsxindex c35bbc57aed..f603752f9b2 100644--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx@@ -101,7 +101,7 @@ type BookingField = z.infer<typeof fieldSchema>;export type EventAdvancedBaseProps = Pick<EventTypeSetupProps, "eventType" | "team"> & {user?: Partial<- Pick<RouterOutputs["viewer"]["me"], "email" | "secondaryEmails" | "theme" | "defaultBookerLayouts">+ Pick<RouterOutputs["viewer"]["me"]["get"], "email" | "secondaryEmails" | "theme" | "defaultBookerLayouts">>;isUserLoading?: boolean;showToast: (message: string, variant: "success" | "warning" | "error") => void;diff --git a/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx b/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsxindex 918e7578a75..2b4064a3233 100644--- a/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx+++ b/packages/features/eventtypes/components/tabs/availability/EventAvailabilityTab.tsx@@ -70,7 +70,7 @@ type EventTypeScheduleDetailsProps = {schedule: Array<Pick<ScheduleQueryData["schedule"][number], "days" | "startTime" | "endTime">>;};isSchedulePending?: boolean;- user?: Pick<RouterOutputs["viewer"]["me"], "timeFormat" | "weekStart">;+ user?: Pick<RouterOutputs["viewer"]["me"]["get"], "timeFormat" | "weekStart">;editAvailabilityRedirectUrl?: string;customClassNames?: AvailabilityTableCustomClassNames;};diff --git a/packages/features/settings/BookerLayoutSelector.tsx b/packages/features/settings/BookerLayoutSelector.tsxindex 1373071b6cb..a099cd06ccd 100644--- a/packages/features/settings/BookerLayoutSelector.tsx+++ b/packages/features/settings/BookerLayoutSelector.tsx@@ -34,7 +34,7 @@ type BookerLayoutSelectorProps = {isLoading?: boolean;isDisabled?: boolean;isOuterBorder?: boolean;- user?: Partial<Pick<RouterOutputs["viewer"]["me"], "defaultBookerLayouts">>;+ user?: Partial<Pick<RouterOutputs["viewer"]["me"]["get"], "defaultBookerLayouts">>;isUserLoading?: boolean;};@@ -104,7 +104,7 @@ type BookerLayoutFieldsProps = {showUserSettings: boolean;isDark?: boolean;isOuterBorder?: boolean;- user?: Partial<Pick<RouterOutputs["viewer"]["me"], "defaultBookerLayouts">>;+ user?: Partial<Pick<RouterOutputs["viewer"]["me"]["get"], "defaultBookerLayouts">>;isUserLoading?: boolean;};diff --git a/packages/features/settings/TimezoneChangeDialog.tsx b/packages/features/settings/TimezoneChangeDialog.tsxindex e241e1730d6..94f16cbc9c9 100644--- a/packages/features/settings/TimezoneChangeDialog.tsx+++ b/packages/features/settings/TimezoneChangeDialog.tsx@@ -69,7 +69,7 @@ const TimezoneChangeDialogContent = () => {};export function useOpenTimezoneDialog() {- const { data: user } = trpc.viewer.me.useQuery();+ const { data: user } = trpc.viewer.me.get.useQuery();const [showDialog, setShowDialog] = useState(false);const { data: userSession, status } = useSession();diff --git a/packages/features/shell/banners/useBanners.ts b/packages/features/shell/banners/useBanners.tsindex 7b8d60b8f45..1fc7bbc24a1 100644--- a/packages/features/shell/banners/useBanners.ts+++ b/packages/features/shell/banners/useBanners.ts@@ -7,7 +7,7 @@ import { trpc } from "@calcom/trpc/react";import { type AllBannerProps } from "./LayoutBanner";const _useBanners = () => {- const { data: getUserTopBanners, isPending } = trpc.viewer.getUserTopBanners.useQuery();+ const { data: getUserTopBanners, isPending } = trpc.viewer.me.getUserTopBanners.useQuery();const { data: userSession } = useSession();if (isPending || !userSession) return null;diff --git a/packages/features/shell/user-dropdown/ProfileDropdown.tsx b/packages/features/shell/user-dropdown/ProfileDropdown.tsxindex 8d7e99e6fa3..07724d3644d 100644--- a/packages/features/shell/user-dropdown/ProfileDropdown.tsx+++ b/packages/features/shell/user-dropdown/ProfileDropdown.tsx@@ -18,7 +18,7 @@ import classNames from "@calcom/ui/classNames";export function ProfileDropdown() {const { update, data: sessionData } = useSession();- const { data } = trpc.viewer.me.useQuery();+ const { data } = trpc.viewer.me.get.useQuery();const [menuOpen, setMenuOpen] = useState(false);const refreshData = useRefreshData();diff --git a/packages/features/users/components/CalendarCredentialBanner.tsx b/packages/features/users/components/CalendarCredentialBanner.tsxindex c20448d78b5..07965c6a934 100644--- a/packages/features/users/components/CalendarCredentialBanner.tsx+++ b/packages/features/users/components/CalendarCredentialBanner.tsx@@ -5,7 +5,7 @@ import { type RouterOutputs } from "@calcom/trpc";import { TopBanner } from "@calcom/ui";export type CalendarCredentialBannerProps = {- data: RouterOutputs["viewer"]["getUserTopBanners"]["calendarCredentialBanner"];+ data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["calendarCredentialBanner"];};function CalendarCredentialBanner({ data }: CalendarCredentialBannerProps) {diff --git a/packages/features/users/components/InvalidAppCredentialsBanner.tsx b/packages/features/users/components/InvalidAppCredentialsBanner.tsxindex e97c708eee5..05e260374be 100644--- a/packages/features/users/components/InvalidAppCredentialsBanner.tsx+++ b/packages/features/users/components/InvalidAppCredentialsBanner.tsx@@ -5,7 +5,7 @@ import { type RouterOutputs } from "@calcom/trpc";import { TopBanner } from "@calcom/ui";export type InvalidAppCredentialBannersProps = {- data: RouterOutputs["viewer"]["getUserTopBanners"]["invalidAppCredentialBanners"];+ data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["invalidAppCredentialBanners"];};export function InvalidAppCredentialBanners({ data }: InvalidAppCredentialBannersProps) {diff --git a/packages/lib/hooks/useHasPaidPlan.ts b/packages/lib/hooks/useHasPaidPlan.tsindex a3496789e14..42de33c16d3 100644--- a/packages/lib/hooks/useHasPaidPlan.ts+++ b/packages/lib/hooks/useHasPaidPlan.ts@@ -8,7 +8,7 @@ export function useHasPaidPlan() {const { data: hasTeamPlan, isPending: isPendingTeamQuery } = trpc.viewer.teams.hasTeamPlan.useQuery();- const { data: user, isPending: isPendingUserQuery } = trpc.viewer.me.useQuery();+ const { data: user, isPending: isPendingUserQuery } = trpc.viewer.me.get.useQuery();const isPending = isPendingTeamQuery || isPendingUserQuery;diff --git a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsxindex 11cddf21864..5e149381f6c 100644--- a/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx+++ b/packages/platform/atoms/event-types/wrappers/EventAvailabilityTabWebWrapper.tsx@@ -11,7 +11,7 @@ import { trpc } from "@calcom/trpc/react";export type EventAvailabilityTabWebWrapperProps = {eventType: EventTypeSetup;isTeamEvent: boolean;- user?: RouterOutputs["viewer"]["me"];+ user?: RouterOutputs["viewer"]["me"]["get"];teamMembers: TeamMembers;};diff --git a/packages/trpc/react/hooks/useEmailVerifyCheck.ts b/packages/trpc/react/hooks/useEmailVerifyCheck.tsindex 1ce89d5ebc8..6c1a43b8c9b 100644--- a/packages/trpc/react/hooks/useEmailVerifyCheck.ts+++ b/packages/trpc/react/hooks/useEmailVerifyCheck.ts@@ -1,7 +1,7 @@import { trpc } from "../trpc";export function useEmailVerifyCheck() {- const emailCheck = trpc.viewer.shouldVerifyEmail.useQuery(undefined, {+ const emailCheck = trpc.viewer.me.shouldVerifyEmail.useQuery(undefined, {retry(failureCount) {return failureCount > 3;},diff --git a/packages/trpc/react/hooks/useMeQuery.ts b/packages/trpc/react/hooks/useMeQuery.tsindex ad0942097b9..ec77691d664 100644--- a/packages/trpc/react/hooks/useMeQuery.ts+++ b/packages/trpc/react/hooks/useMeQuery.ts@@ -1,7 +1,7 @@import { trpc } from "../trpc";export function useMeQuery() {- const meQuery = trpc.viewer.me.useQuery(undefined, {+ const meQuery = trpc.viewer.me.get.useQuery(undefined, {retry(failureCount) {return failureCount > 3;},diff --git a/packages/trpc/react/shared.ts b/packages/trpc/react/shared.tsindex b826a0526df..45bd724cf66 100644--- a/packages/trpc/react/shared.ts+++ b/packages/trpc/react/shared.ts@@ -14,7 +14,9 @@ export const ENDPOINTS = ["eventTypes","features","highPerf",+ "i18n","insights",+ "me","payments","public","timezones",diff --git a/packages/trpc/server/createNextApiHandler.ts b/packages/trpc/server/createNextApiHandler.tsindex a824589d06f..064d1f388a9 100644--- a/packages/trpc/server/createNextApiHandler.ts+++ b/packages/trpc/server/createNextApiHandler.ts@@ -67,7 +67,7 @@ export function createNextApiHandler(router: AnyRouter, isPublic = false, namesp// i18n and cityTimezones are now being accessed using the CalComVersion, which updates on every release,// letting the clients get the new versions when the version number changes.- i18n: SETTING_FOR_CACHED_BY_VERSION,+ "i18n.get": SETTING_FOR_CACHED_BY_VERSION,cityTimezones: SETTING_FOR_CACHED_BY_VERSION,// FIXME: Using `max-age=1, stale-while-revalidate=60` fails some booking tests.diff --git a/packages/trpc/server/routers/loggedInViewer/_router.tsx b/packages/trpc/server/routers/loggedInViewer/_router.tsxindex ff172c5eec2..e21eeec7ffe 100644--- a/packages/trpc/server/routers/loggedInViewer/_router.tsx+++ b/packages/trpc/server/routers/loggedInViewer/_router.tsx@@ -7,7 +7,6 @@ import { ZAppCredentialsByTypeInputSchema } from "./appCredentialsByType.schema"import { ZConnectAndJoinInputSchema } from "./connectAndJoin.schema";import { ZConnectedCalendarsInputSchema } from "./connectedCalendars.schema";import { ZDeleteCredentialInputSchema } from "./deleteCredential.schema";-import { ZDeleteMeInputSchema } from "./deleteMe.schema";import { ZEventTypeOrderInputSchema } from "./eventTypeOrder.schema";import { ZGetCalVideoRecordingsInputSchema } from "./getCalVideoRecordings.schema";import { ZGetDownloadLinkOfCalVideoRecordingsInputSchema } from "./getDownloadLinkOfCalVideoRecordings.schema";@@ -17,9 +16,6 @@ import { ZNoShowInputSchema } from "./markNoShow.schema";import { ZOutOfOfficeInputSchema } from "./outOfOfficeCreateOrUpdate.schema";import { ZOutOfOfficeEntriesListSchema } from "./outOfOfficeEntriesList.schema";import { ZOutOfOfficeDelete } from "./outOfOfficeEntryDelete.schema";-import { me } from "./procedures/me";-import { myStats } from "./procedures/myStats";-import { platformMe } from "./procedures/platformMe";import { teamsAndUserProfilesQuery } from "./procedures/teamsAndUserProfilesQuery";import { ZRemoveNotificationsSubscriptionInputSchema } from "./removeNotificationsSubscription.schema";import { ZRoutingFormOrderInputSchema } from "./routingFormOrder.schema";@@ -34,12 +30,6 @@ const NAMESPACE = "loggedInViewer";const namespaced = (s: string) => `${NAMESPACE}.${s}`;type AppsRouterHandlerCache = {- me?: typeof import("./me.handler").meHandler;- myStats?: typeof import("./myStats.handler").myStatsHandler;- platformMe?: typeof import("./platformMe.handler").platformMeHandler;- shouldVerifyEmail?: typeof import("./shouldVerifyEmail.handler").shouldVerifyEmailHandler;- deleteMe?: typeof import("./deleteMe.handler").deleteMeHandler;- deleteMeWithoutPassword?: typeof import("./deleteMeWithoutPassword.handler").deleteMeWithoutPasswordHandler;connectedCalendars?: typeof import("./connectedCalendars.handler").connectedCalendarsHandler;setDestinationCalendar?: typeof import("./setDestinationCalendar.handler").setDestinationCalendarHandler;integrations?: typeof import("./integrations.handler").integrationsHandler;@@ -53,13 +43,11 @@ type AppsRouterHandlerCache = {submitFeedback?: typeof import("./submitFeedback.handler").submitFeedbackHandler;locationOptions?: typeof import("./locationOptions.handler").locationOptionsHandler;deleteCredential?: typeof import("./deleteCredential.handler").deleteCredentialHandler;- bookingUnconfirmedCount?: typeof import("./bookingUnconfirmedCount.handler").bookingUnconfirmedCountHandler;getCalVideoRecordings?: typeof import("./getCalVideoRecordings.handler").getCalVideoRecordingsHandler;getDownloadLinkOfCalVideoRecordings?: typeof import("./getDownloadLinkOfCalVideoRecordings.handler").getDownloadLinkOfCalVideoRecordingsHandler;getUsersDefaultConferencingApp?: typeof import("./getUsersDefaultConferencingApp.handler").getUsersDefaultConferencingAppHandler;updateUserDefaultConferencingApp?: typeof import("./updateUserDefaultConferencingApp.handler").updateUserDefaultConferencingAppHandler;teamsAndUserProfilesQuery?: typeof import("./teamsAndUserProfilesQuery.handler").teamsAndUserProfilesQuery;- getUserTopBanners?: typeof import("./getUserTopBanners.handler").getUserTopBannersHandler;connectAndJoin?: typeof import("./connectAndJoin.handler").Handler;outOfOfficeCreateOrUpdate?: typeof import("./outOfOfficeCreateOrUpdate.handler").outOfOfficeCreateOrUpdate;outOfOfficeEntriesList?: typeof import("./outOfOfficeEntriesList.handler").outOfOfficeEntriesList;@@ -75,38 +63,6 @@ type AppsRouterHandlerCache = {const UNSTABLE_HANDLER_CACHE: AppsRouterHandlerCache = {};export const loggedInViewerRouter = router({- me,- myStats,- platformMe,-- deleteMe: authedProcedure.input(ZDeleteMeInputSchema).mutation(async ({ ctx, input }) => {- if (!UNSTABLE_HANDLER_CACHE.deleteMe) {- UNSTABLE_HANDLER_CACHE.deleteMe = (await import("./deleteMe.handler")).deleteMeHandler;- }-- // Unreachable code but required for type safety- if (!UNSTABLE_HANDLER_CACHE.deleteMe) {- throw new Error("Failed to load handler");- }-- return UNSTABLE_HANDLER_CACHE.deleteMe({ ctx, input });- }),-- deleteMeWithoutPassword: authedProcedure.mutation(async ({ ctx }) => {- if (!UNSTABLE_HANDLER_CACHE.deleteMeWithoutPassword) {- UNSTABLE_HANDLER_CACHE.deleteMeWithoutPassword = (- await import("./deleteMeWithoutPassword.handler")- ).deleteMeWithoutPasswordHandler;- }-- // Unreachable code but required for type safety- if (!UNSTABLE_HANDLER_CACHE.deleteMeWithoutPassword) {- throw new Error("Failed to load handler");- }-- return UNSTABLE_HANDLER_CACHE.deleteMeWithoutPassword({ ctx });- }),-connectedCalendars: authedProcedure.input(ZConnectedCalendarsInputSchema).query(async ({ ctx, input }) => {if (!UNSTABLE_HANDLER_CACHE.connectedCalendars) {UNSTABLE_HANDLER_CACHE.connectedCalendars = (@@ -307,21 +263,6 @@ export const loggedInViewerRouter = router({return UNSTABLE_HANDLER_CACHE.deleteCredential({ ctx, input });}),- bookingUnconfirmedCount: authedProcedure.query(async ({ ctx }) => {- if (!UNSTABLE_HANDLER_CACHE.bookingUnconfirmedCount) {- UNSTABLE_HANDLER_CACHE.bookingUnconfirmedCount = (- await import("./bookingUnconfirmedCount.handler")- ).bookingUnconfirmedCountHandler;- }-- // Unreachable code but required for type safety- if (!UNSTABLE_HANDLER_CACHE.bookingUnconfirmedCount) {- throw new Error("Failed to load handler");- }-- return UNSTABLE_HANDLER_CACHE.bookingUnconfirmedCount({ ctx });- }),-getCalVideoRecordings: authedProcedure.input(ZGetCalVideoRecordingsInputSchema).query(async ({ ctx, input }) => {@@ -339,21 +280,6 @@ export const loggedInViewerRouter = router({return UNSTABLE_HANDLER_CACHE.getCalVideoRecordings({ ctx, input });}),- getUserTopBanners: authedProcedure.query(async ({ ctx }) => {- if (!UNSTABLE_HANDLER_CACHE.getUserTopBanners) {- UNSTABLE_HANDLER_CACHE.getUserTopBanners = (- await import("./getUserTopBanners.handler")- ).getUserTopBannersHandler;- }-- // Unreachable code but required for type safety- if (!UNSTABLE_HANDLER_CACHE.getUserTopBanners) {- throw new Error("Failed to load handler");- }-- return UNSTABLE_HANDLER_CACHE.getUserTopBanners({ ctx });- }),-getDownloadLinkOfCalVideoRecordings: authedProcedure.input(ZGetDownloadLinkOfCalVideoRecordingsInputSchema).query(async ({ ctx, input }) => {@@ -402,20 +328,6 @@ export const loggedInViewerRouter = router({return UNSTABLE_HANDLER_CACHE.updateUserDefaultConferencingApp({ ctx, input });}),- shouldVerifyEmail: authedProcedure.query(async ({ ctx }) => {- if (!UNSTABLE_HANDLER_CACHE.shouldVerifyEmail) {- UNSTABLE_HANDLER_CACHE.shouldVerifyEmail = (- await import("./shouldVerifyEmail.handler")- ).shouldVerifyEmailHandler;- }-- // Unreachable code but required for type safety- if (!UNSTABLE_HANDLER_CACHE.shouldVerifyEmail) {- throw new Error("Failed to load handler");- }-- return UNSTABLE_HANDLER_CACHE.shouldVerifyEmail({ ctx });- }),teamsAndUserProfilesQuery,connectAndJoin: authedProcedure.input(ZConnectAndJoinInputSchema).mutation(async ({ ctx, input }) => {if (!UNSTABLE_HANDLER_CACHE.connectAndJoin) {diff --git a/packages/trpc/server/routers/loggedInViewer/procedures/me.ts b/packages/trpc/server/routers/loggedInViewer/procedures/me.tsdeleted file mode 100644index 9ff7c275884..00000000000--- a/packages/trpc/server/routers/loggedInViewer/procedures/me.ts+++ /dev/null@@ -1,8 +0,0 @@-import authedProcedure from "../../../procedures/authedProcedure";-import { ZMeInputSchema } from "../me.schema";--export const me = authedProcedure.input(ZMeInputSchema).query(async ({ ctx, input }) => {- const handler = (await import("../me.handler")).meHandler;-- return handler({ ctx, input });-});diff --git a/packages/trpc/server/routers/publicViewer/_router.tsx b/packages/trpc/server/routers/publicViewer/_router.tsxindex c52aca102a3..a61b50d0ac8 100644--- a/packages/trpc/server/routers/publicViewer/_router.tsx+++ b/packages/trpc/server/routers/publicViewer/_router.tsx@@ -2,7 +2,6 @@ import publicProcedure from "../../procedures/publicProcedure";import { importHandler, router } from "../../trpc";import { slotsRouter } from "../viewer/slots/_router";import { ZUserEmailVerificationRequiredSchema } from "./checkIfUserEmailVerificationRequired.schema";-import { i18nInputSchema } from "./i18n.schema";import { ZMarkHostAsNoShowInputSchema } from "./markHostAsNoShow.schema";import { event } from "./procedures/event";import { session } from "./procedures/session";@@ -17,10 +16,6 @@ const namespaced = (s: string) => `${NAMESPACE}.${s}`;// things that unauthenticated users can query about themselvesexport const publicViewerRouter = router({session,- i18n: publicProcedure.input(i18nInputSchema).query(async (opts) => {- const handler = await importHandler(namespaced("i18n"), () => import("./i18n.handler"));- return handler(opts);- }),countryCode: publicProcedure.query(async (opts) => {const handler = await importHandler(namespaced("countryCode"), () => import("./countryCode.handler"));return handler(opts);diff --git a/packages/trpc/server/routers/viewer/_router.tsx b/packages/trpc/server/routers/viewer/_router.tsxindex b1fff5d14e5..55b4301e6c6 100644--- a/packages/trpc/server/routers/viewer/_router.tsx+++ b/packages/trpc/server/routers/viewer/_router.tsx@@ -21,6 +21,8 @@ import { dsyncRouter } from "./dsync/_router";import { eventTypesRouter } from "./eventTypes/_router";import { googleWorkspaceRouter } from "./googleWorkspace/_router";import { highPerfRouter } from "./highPerf/_router";+import { i18nRouter } from "./i18n/_router";+import { meRouter } from "./me/_router";import { oAuthRouter } from "./oAuth/_router";import { viewerOrganizationsRouter } from "./organizations/_router";import { paymentsRouter } from "./payments/_router";@@ -35,7 +37,7 @@ export const viewerRouter = mergeRouters(loggedInViewerRouter,router({- loggedInViewerRouter,+ me: meRouter,public: publicViewerRouter,auth: authRouter,deploymentSetup: deploymentSetupRouter,@@ -52,6 +54,7 @@ export const viewerRouter = mergeRouters(workflows: workflowsRouter,saml: ssoRouter,dsync: dsyncRouter,+ i18n: i18nRouter,insights: insightsRouter,payments: paymentsRouter,// NOTE: Add all app related routes in the bottom till the problem described in @calcom/app-store/trpc-routers.ts is solved.diff --git a/packages/trpc/server/routers/viewer/i18n/_router.tsx b/packages/trpc/server/routers/viewer/i18n/_router.tsxnew file mode 100644index 00000000000..d1372b4e5eb--- /dev/null+++ b/packages/trpc/server/routers/viewer/i18n/_router.tsx@@ -0,0 +1,10 @@+import publicProcedure from "../../../procedures/publicProcedure";+import { router } from "../../../trpc";+import { i18nInputSchema } from "./i18n.schema";++export const i18nRouter = router({+ get: publicProcedure.input(i18nInputSchema).query(async (opts) => {+ const handler = (await import("./i18n.handler")).i18nHandler;+ return handler(opts);+ }),+});diff --git a/packages/trpc/server/routers/publicViewer/i18n.handler.ts b/packages/trpc/server/routers/viewer/i18n/i18n.handler.tssimilarity index 100%rename from packages/trpc/server/routers/publicViewer/i18n.handler.tsrename to packages/trpc/server/routers/viewer/i18n/i18n.handler.tsdiff --git a/packages/trpc/server/routers/publicViewer/i18n.schema.ts b/packages/trpc/server/routers/viewer/i18n/i18n.schema.tssimilarity index 100%rename from packages/trpc/server/routers/publicViewer/i18n.schema.tsrename to packages/trpc/server/routers/viewer/i18n/i18n.schema.tsdiff --git a/packages/trpc/server/routers/viewer/me/_router.tsx b/packages/trpc/server/routers/viewer/me/_router.tsxnew file mode 100644index 00000000000..ca1b057a48d--- /dev/null+++ b/packages/trpc/server/routers/viewer/me/_router.tsx@@ -0,0 +1,36 @@+import authedProcedure from "../../../procedures/authedProcedure";+import { router } from "../../../trpc";+import { ZDeleteMeInputSchema } from "./deleteMe.schema";+import { get } from "./procedures/get";++export const meRouter = router({+ bookingUnconfirmedCount: authedProcedure.query(async ({ ctx }) => {+ const handler = (await import("./bookingUnconfirmedCount.handler")).bookingUnconfirmedCountHandler;+ return handler({ ctx });+ }),+ deleteMe: authedProcedure.input(ZDeleteMeInputSchema).mutation(async ({ ctx, input }) => {+ const handler = (await import("./deleteMe.handler")).deleteMeHandler;+ return handler({ ctx, input });+ }),+ deleteMeWithoutPassword: authedProcedure.mutation(async ({ ctx }) => {+ const handler = (await import("./deleteMeWithoutPassword.handler")).deleteMeWithoutPasswordHandler;+ return handler({ ctx });+ }),+ get,+ getUserTopBanners: authedProcedure.query(async ({ ctx }) => {+ const handler = (await import("./getUserTopBanners.handler")).getUserTopBannersHandler;+ return handler({ ctx });+ }),+ myStats: authedProcedure.query(async ({ ctx }) => {+ const handler = (await import("./myStats.handler")).myStatsHandler;+ return handler({ ctx });+ }),+ platformMe: authedProcedure.query(async ({ ctx }) => {+ const handler = (await import("./platformMe.handler")).platformMeHandler;+ return handler({ ctx });+ }),+ shouldVerifyEmail: authedProcedure.query(async ({ ctx }) => {+ const handler = (await import("./shouldVerifyEmail.handler")).shouldVerifyEmailHandler;+ return handler({ ctx });+ }),+});diff --git a/packages/trpc/server/routers/loggedInViewer/bookingUnconfirmedCount.handler.ts b/packages/trpc/server/routers/viewer/me/bookingUnconfirmedCount.handler.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/bookingUnconfirmedCount.handler.tsrename to packages/trpc/server/routers/viewer/me/bookingUnconfirmedCount.handler.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/bookingUnconfirmedCount.schema.ts b/packages/trpc/server/routers/viewer/me/bookingUnconfirmedCount.schema.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/bookingUnconfirmedCount.schema.tsrename to packages/trpc/server/routers/viewer/me/bookingUnconfirmedCount.schema.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/checkForInvalidAppCredentials.ts b/packages/trpc/server/routers/viewer/me/checkForInvalidAppCredentials.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/checkForInvalidAppCredentials.tsrename to packages/trpc/server/routers/viewer/me/checkForInvalidAppCredentials.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/deleteMe.handler.ts b/packages/trpc/server/routers/viewer/me/deleteMe.handler.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/deleteMe.handler.tsrename to packages/trpc/server/routers/viewer/me/deleteMe.handler.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/deleteMe.schema.ts b/packages/trpc/server/routers/viewer/me/deleteMe.schema.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/deleteMe.schema.tsrename to packages/trpc/server/routers/viewer/me/deleteMe.schema.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/deleteMeWithoutPassword.handler.ts b/packages/trpc/server/routers/viewer/me/deleteMeWithoutPassword.handler.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/deleteMeWithoutPassword.handler.tsrename to packages/trpc/server/routers/viewer/me/deleteMeWithoutPassword.handler.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/deleteMeWithoutPassword.schema.ts b/packages/trpc/server/routers/viewer/me/deleteMeWithoutPassword.schema.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/deleteMeWithoutPassword.schema.tsrename to packages/trpc/server/routers/viewer/me/deleteMeWithoutPassword.schema.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/me.handler.ts b/packages/trpc/server/routers/viewer/me/get.handler.tssimilarity index 96%rename from packages/trpc/server/routers/loggedInViewer/me.handler.tsrename to packages/trpc/server/routers/viewer/me/get.handler.tsindex db90b4f3180..c47045f3fee 100644--- a/packages/trpc/server/routers/loggedInViewer/me.handler.ts+++ b/packages/trpc/server/routers/viewer/me/get.handler.ts@@ -8,17 +8,17 @@ import { IdentityProvider, MembershipRole } from "@calcom/prisma/enums";import { userMetadata } from "@calcom/prisma/zod-utils";import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";-import type { TMeInputSchema } from "./me.schema";+import type { TGetInputSchema } from "./get.schema";type MeOptions = {ctx: {user: NonNullable<TrpcSessionUser>;session: Session;};- input: TMeInputSchema;+ input: TGetInputSchema;};-export const meHandler = async ({ ctx, input }: MeOptions) => {+export const getHandler = async ({ ctx, input }: MeOptions) => {const crypto = await import("crypto");const { user: sessionUser, session } = ctx;diff --git a/packages/trpc/server/routers/loggedInViewer/me.schema.ts b/packages/trpc/server/routers/viewer/me/get.schema.tssimilarity index 53%rename from packages/trpc/server/routers/loggedInViewer/me.schema.tsrename to packages/trpc/server/routers/viewer/me/get.schema.tsindex e405c374f0d..c0a3e4d6d0f 100644--- a/packages/trpc/server/routers/loggedInViewer/me.schema.ts+++ b/packages/trpc/server/routers/viewer/me/get.schema.ts@@ -1,9 +1,9 @@import { z } from "zod";-export const ZMeInputSchema = z+export const ZGetInputSchema = z.object({includePasswordAdded: z.boolean().optional(),}).optional();-export type TMeInputSchema = z.infer<typeof ZMeInputSchema>;+export type TGetInputSchema = z.infer<typeof ZGetInputSchema>;diff --git a/packages/trpc/server/routers/loggedInViewer/getUserTopBanners.handler.ts b/packages/trpc/server/routers/viewer/me/getUserTopBanners.handler.tssimilarity index 93%rename from packages/trpc/server/routers/loggedInViewer/getUserTopBanners.handler.tsrename to packages/trpc/server/routers/viewer/me/getUserTopBanners.handler.tsindex dedd6582175..0246db67b5c 100644--- a/packages/trpc/server/routers/loggedInViewer/getUserTopBanners.handler.ts+++ b/packages/trpc/server/routers/viewer/me/getUserTopBanners.handler.ts@@ -4,8 +4,8 @@ import { prisma } from "@calcom/prisma";import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential";import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";-import { checkIfOrgNeedsUpgradeHandler } from "../viewer/organizations/checkIfOrgNeedsUpgrade.handler";-import { getUpgradeableHandler } from "../viewer/teams/getUpgradeable.handler";+import { checkIfOrgNeedsUpgradeHandler } from "../organizations/checkIfOrgNeedsUpgrade.handler";+import { getUpgradeableHandler } from "../teams/getUpgradeable.handler";import { checkInvalidAppCredentials } from "./checkForInvalidAppCredentials";import { shouldVerifyEmailHandler } from "./shouldVerifyEmail.handler";diff --git a/packages/trpc/server/routers/loggedInViewer/myStats.handler.ts b/packages/trpc/server/routers/viewer/me/myStats.handler.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/myStats.handler.tsrename to packages/trpc/server/routers/viewer/me/myStats.handler.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/myStats.schema.ts b/packages/trpc/server/routers/viewer/me/myStats.schema.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/myStats.schema.tsrename to packages/trpc/server/routers/viewer/me/myStats.schema.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/platformMe.handler.ts b/packages/trpc/server/routers/viewer/me/platformMe.handler.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/platformMe.handler.tsrename to packages/trpc/server/routers/viewer/me/platformMe.handler.tsdiff --git a/packages/trpc/server/routers/viewer/me/procedures/get.ts b/packages/trpc/server/routers/viewer/me/procedures/get.tsnew file mode 100644index 00000000000..239eaddd26b--- /dev/null+++ b/packages/trpc/server/routers/viewer/me/procedures/get.ts@@ -0,0 +1,8 @@+import authedProcedure from "../../../../procedures/authedProcedure";+import { ZGetInputSchema } from "../get.schema";++export const get = authedProcedure.input(ZGetInputSchema).query(async ({ ctx, input }) => {+ const handler = (await import("../get.handler")).getHandler;++ return handler({ ctx, input });+});diff --git a/packages/trpc/server/routers/loggedInViewer/procedures/myStats.ts b/packages/trpc/server/routers/viewer/me/procedures/myStats.tssimilarity index 71%rename from packages/trpc/server/routers/loggedInViewer/procedures/myStats.tsrename to packages/trpc/server/routers/viewer/me/procedures/myStats.tsindex 4202796bc69..068a17050c8 100644--- a/packages/trpc/server/routers/loggedInViewer/procedures/myStats.ts+++ b/packages/trpc/server/routers/viewer/me/procedures/myStats.ts@@ -1,4 +1,4 @@-import authedProcedure from "../../../procedures/authedProcedure";+import authedProcedure from "../../../../procedures/authedProcedure";export const myStats = authedProcedure.query(async ({ ctx, input }) => {const handler = (await import("../myStats.handler")).myStatsHandler;diff --git a/packages/trpc/server/routers/loggedInViewer/procedures/platformMe.ts b/packages/trpc/server/routers/viewer/me/procedures/platformMe.tssimilarity index 71%rename from packages/trpc/server/routers/loggedInViewer/procedures/platformMe.tsrename to packages/trpc/server/routers/viewer/me/procedures/platformMe.tsindex 0b6f555d3b4..cfe2f65cf7e 100644--- a/packages/trpc/server/routers/loggedInViewer/procedures/platformMe.ts+++ b/packages/trpc/server/routers/viewer/me/procedures/platformMe.ts@@ -1,4 +1,4 @@-import authedProcedure from "../../../procedures/authedProcedure";+import authedProcedure from "../../../../procedures/authedProcedure";export const platformMe = authedProcedure.query(async ({ ctx }) => {const handler = (await import("../platformMe.handler")).platformMeHandler;diff --git a/packages/trpc/server/routers/loggedInViewer/shouldVerifyEmail.handler.ts b/packages/trpc/server/routers/viewer/me/shouldVerifyEmail.handler.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/shouldVerifyEmail.handler.tsrename to packages/trpc/server/routers/viewer/me/shouldVerifyEmail.handler.tsdiff --git a/packages/trpc/server/routers/loggedInViewer/shouldVerifyEmail.schema.ts b/packages/trpc/server/routers/viewer/me/shouldVerifyEmail.schema.tssimilarity index 100%rename from packages/trpc/server/routers/loggedInViewer/shouldVerifyEmail.schema.tsrename to packages/trpc/server/routers/viewer/me/shouldVerifyEmail.schema.ts