fix: unauthorized trpc error in /getting-started page (#23040)

This commit is contained in:
Benny Joo authored and GitHub committed 2025-08-12 15:58:07 +01:00
1 parent abe92cd693
commit 6ba3049314
2 files changed
+16 -9

No files matched your search

@@ -1,3 +1,4 @@
import { createRouterCaller } from "app/_trpc/context";
import type { PageProps as ServerPageProps } from "app/_types";
import { _generateMetadata } from "app/_utils";
import { cookies, headers } from "next/headers";
@@ -7,6 +8,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
import { APP_NAME } from "@calcom/lib/constants";
import { UserRepository } from "@calcom/lib/server/repository/user";
import prisma from "@calcom/prisma";
import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";
import { buildLegacyRequest } from "@lib/buildLegacyCtx";
@@ -32,15 +34,20 @@ const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
}
const userRepo = new UserRepository(prisma);
const user = await userRepo.findUserTeams({
id: session.user.id,
});
const meCaller = await createRouterCaller(meRouter);
if (!user) {
const [userTeams, user] = await Promise.all([
userRepo.findUserTeams({
id: session.user.id,
}),
meCaller.get(),
]);
if (!userTeams || !user) {
return redirect("/auth/login");
}
return <Page hasPendingInvites={!!user.teams.find((team) => team.accepted === false)} />;
return <Page user={user} hasPendingInvites={!!userTeams.teams.find((team) => team.accepted === false)} />;
};
export default ServerPage;
@@ -10,8 +10,7 @@ import { z } from "zod";
import { APP_NAME } from "@calcom/lib/constants";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
import { trpc } from "@calcom/trpc";
import type { inferSSRProps } from "@calcom/types/inferSSRProps";
import type { RouterOutputs } from "@calcom/trpc/react";
import classNames from "@calcom/ui/classNames";
import { Button } from "@calcom/ui/components/button";
import { StepCard } from "@calcom/ui/components/card";
@@ -85,13 +84,14 @@ const stepRouteSchema = z.object({
type PageProps = {
hasPendingInvites: boolean;
user: RouterOutputs["viewer"]["me"]["get"];
};
const OnboardingPage = (props: PageProps) => {
const pathname = usePathname();
const params = useParamsWithFallback();
const user = props.user;
const router = useRouter();
const [user] = trpc.viewer.me.get.useSuspenseQuery();
const { t } = useLocale();
const [isNextStepLoading, startTransition] = useTransition();