Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Remove user.getAuthed from tRPC (#2692)

Luke Vellad42288e49915
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx
index bcee13d69..663070a63 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/components/control-panel-menu-item.tsx
@@ -3,11 +3,11 @@
import { SidebarMenuButton, SidebarMenuItem } from "@rallly/ui/sidebar";
import { GaugeIcon } from "lucide-react";
import Link from "next/link";
+import { useUser } from "@/features/user/components/user-provider";
import { Trans } from "@/i18n/client";
-import { trpc } from "@/trpc/client";
export function ControlPanelMenuItem() {
- const { data: user } = trpc.user.getAuthed.useQuery();
+ const { user } = useUser();
if (user?.role !== "admin") {
return null;
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx
index 47a24a8a8..93686717d 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx
@@ -14,11 +14,11 @@ import {
import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import { SettingsIcon } from "lucide-react";
import Link from "next/link";
-import { NavUser } from "@/components/nav-user";
import { CustomBrandingPrompt } from "@/features/branding/components/custom-branding-prompt";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/components/command-menu";
import { SpaceDropdown } from "@/features/space/components/space-dropdown";
+import { NavUser } from "@/features/user/components/nav-user";
import { Trans } from "@/i18n/client";
import { IfFeatureEnabled } from "@/lib/feature-flags/client";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
@@ -37,7 +37,6 @@ export default async function Layout({
await Promise.all([
helpers.billing.getTier.prefetch(),
- helpers.user.getAuthed.prefetch(),
helpers.spaces.list.prefetch(),
]);
diff --git a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
index 69a8171df..db167d1dd 100644
--- a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx
@@ -26,9 +26,9 @@ import {
import { usePathname } from "next/navigation";
import { HoverPrefetchLink } from "@/components/hover-prefetch-link";
import { useSpace } from "@/features/space/client";
+import { useAuthedUser } from "@/features/user/components/user-provider";
import { Trans, useTranslation } from "@/i18n/client";
import { useFeatureFlag } from "@/lib/feature-flags/client";
-import { trpc } from "@/trpc/client";
export function AccountSidebarMenu() {
const { t } = useTranslation();
@@ -163,7 +163,7 @@ export function SpaceSidebarMenu() {
export function DeveloperSidebarMenu() {
const { data: space } = useSpace();
- const [user] = trpc.user.getAuthed.useSuspenseQuery();
+ const user = useAuthedUser();
const isSpaceOwner = space.ownerId === user.id;
const pathname = usePathname();
const isDeveloperToolsEnabled = useFeatureFlagEnabled("developer-tools");
diff --git a/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx b/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx
index 39cb62b98..a018341a1 100644
--- a/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/general/page-client.tsx
@@ -19,8 +19,8 @@ import {
SettingsPageTitle,
} from "@/components/settings-layout";
import { useSpace } from "@/features/space/client";
+import { useAuthedUser } from "@/features/user/components/user-provider";
import { Trans } from "@/i18n/client";
-import { trpc } from "@/trpc/client";
import { CustomBrandingSection } from "./components/custom-branding-section";
import { DeleteSpaceButton } from "./components/delete-space-button";
import { LeaveSpaceButton } from "./components/leave-space-button";
@@ -28,7 +28,7 @@ import { SpaceSettingsForm } from "./components/space-settings-form";
export function GeneralSettingsPageClient() {
const { data: space, getMemberAbility } = useSpace();
- const [user] = trpc.user.getAuthed.useSuspenseQuery();
+ const user = useAuthedUser();
const ability = getMemberAbility();
const isAdmin = space.role === "admin";
const canDeleteSpace = ability.can("delete", subject("Space", { ...space }));
diff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
index 26cebc79d..72d8d4163 100644
--- a/apps/web/src/app/[locale]/(space)/settings/layout.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/layout.tsx
@@ -15,103 +15,92 @@ import {
SidebarSeparator,
SidebarTrigger,
} from "@rallly/ui/sidebar";
-import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import { ArrowLeftIcon, SettingsIcon } from "lucide-react";
import Link from "next/link";
import type React from "react";
-import { NavUser } from "@/components/nav-user";
+import { NavUser } from "@/features/user/components/nav-user";
import { Trans } from "@/i18n/client";
-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
import {
AccountSidebarMenu,
DeveloperSidebarMenu,
SpaceSidebarMenu,
} from "./components/sidebar";
-export default async function Layout({
- children,
-}: {
- children?: React.ReactNode;
-}) {
- const helpers = await createPrivateSSRHelper();
- await helpers.user.getAuthed.prefetch();
-
+export default function Layout({ children }: { children?: React.ReactNode }) {
return (
- <HydrationBoundary state={dehydrate(helpers.queryClient)}>
- <SidebarProvider>
- <Sidebar>
- <SidebarHeader>
- <SidebarGroup>
- <SidebarGroupContent>
- <SidebarMenu>
- <SidebarMenuItem className="flex h-9 items-center gap-2 px-2">
- <Icon>
- <SettingsIcon />
- </Icon>
- <span className="font-medium text-sm">
- <Trans i18nKey="settings" defaults="Settings" />
- </span>
- </SidebarMenuItem>
- </SidebarMenu>
- </SidebarGroupContent>
- </SidebarGroup>
- </SidebarHeader>
- <SidebarSeparator />
- <SidebarContent>
- <SidebarGroup>
- <SidebarGroupLabel>
- <Trans i18nKey="account" defaults="Account" />
- </SidebarGroupLabel>
- <SidebarGroupContent>
- <AccountSidebarMenu />
- </SidebarGroupContent>
- </SidebarGroup>
- <SidebarGroup>
- <SidebarGroupLabel>
- <Trans i18nKey="space" defaults="Space" />
- </SidebarGroupLabel>
- <SidebarGroupContent>
- <SpaceSidebarMenu />
- </SidebarGroupContent>
- </SidebarGroup>
- <DeveloperSidebarMenu />
- </SidebarContent>
- <SidebarFooter>
- <SidebarGroup>
- <SidebarGroupContent>
- <SidebarMenu>
- <SidebarMenuItem>
- <SidebarMenuButton render={<Link href="/" />}>
- <ArrowLeftIcon />
- <Trans i18nKey="back" defaults="Back" />
- </SidebarMenuButton>
- </SidebarMenuItem>
- </SidebarMenu>
- </SidebarGroupContent>
- </SidebarGroup>
- <SidebarSeparator className="my-1" />
- <NavUser />
- </SidebarFooter>
- </Sidebar>
- <SidebarInset id="main-content" tabIndex={-1}>
- <div className="flex flex-1 flex-col">
- <header className="sticky top-0 z-10 border-b bg-background/90 p-3 backdrop-blur-xs md:hidden">
- <div className="flex items-center gap-4">
- <SidebarTrigger />
- <div className="flex items-center gap-2">
+ <SidebarProvider>
+ <Sidebar>
+ <SidebarHeader>
+ <SidebarGroup>
+ <SidebarGroupContent>
+ <SidebarMenu>
+ <SidebarMenuItem className="flex h-9 items-center gap-2 px-2">
<Icon>
<SettingsIcon />
</Icon>
<span className="font-medium text-sm">
<Trans i18nKey="settings" defaults="Settings" />
</span>
- </div>
+ </SidebarMenuItem>
+ </SidebarMenu>
+ </SidebarGroupContent>
+ </SidebarGroup>
+ </SidebarHeader>
+ <SidebarSeparator />
+ <SidebarContent>
+ <SidebarGroup>
+ <SidebarGroupLabel>
+ <Trans i18nKey="account" defaults="Account" />
+ </SidebarGroupLabel>
+ <SidebarGroupContent>
+ <AccountSidebarMenu />
+ </SidebarGroupContent>
+ </SidebarGroup>
+ <SidebarGroup>
+ <SidebarGroupLabel>
+ <Trans i18nKey="space" defaults="Space" />
+ </SidebarGroupLabel>
+ <SidebarGroupContent>
+ <SpaceSidebarMenu />
+ </SidebarGroupContent>
+ </SidebarGroup>
+ <DeveloperSidebarMenu />
+ </SidebarContent>
+ <SidebarFooter>
+ <SidebarGroup>
+ <SidebarGroupContent>
+ <SidebarMenu>
+ <SidebarMenuItem>
+ <SidebarMenuButton render={<Link href="/" />}>
+ <ArrowLeftIcon />
+ <Trans i18nKey="back" defaults="Back" />
+ </SidebarMenuButton>
+ </SidebarMenuItem>
+ </SidebarMenu>
+ </SidebarGroupContent>
+ </SidebarGroup>
+ <SidebarSeparator className="my-1" />
+ <NavUser />
+ </SidebarFooter>
+ </Sidebar>
+ <SidebarInset id="main-content" tabIndex={-1}>
+ <div className="flex flex-1 flex-col">
+ <header className="sticky top-0 z-10 border-b bg-background/90 p-3 backdrop-blur-xs md:hidden">
+ <div className="flex items-center gap-4">
+ <SidebarTrigger />
+ <div className="flex items-center gap-2">
+ <Icon>
+ <SettingsIcon />
+ </Icon>
+ <span className="font-medium text-sm">
+ <Trans i18nKey="settings" defaults="Settings" />
+ </span>
</div>
- </header>
- <div className="flex-1 p-4 lg:py-12">{children}</div>
- </div>
- </SidebarInset>
- </SidebarProvider>
- </HydrationBoundary>
+ </div>
+ </header>
+ <div className="flex-1 p-4 lg:py-12">{children}</div>
+ </div>
+ </SidebarInset>
+ </SidebarProvider>
);
}
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
index f6dc6cde6..a8e179897 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/delete-account-dialog.tsx
@@ -14,11 +14,12 @@ import { Form, FormField, FormItem, FormMessage } from "@rallly/ui/form";
import { Input } from "@rallly/ui/input";
import { useForm } from "react-hook-form";
+import { useAuthedUser } from "@/features/user/components/user-provider";
import { Trans, useTranslation } from "@/i18n/client";
import { trpc } from "@/trpc/client";
export function DeleteAccountDialog({ children, ...rest }: DialogProps & {}) {
- const [user] = trpc.user.getAuthed.useSuspenseQuery();
+ const user = useAuthedUser();
const form = useForm<{ email: string }>({
defaultValues: {
email: "",
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
index c5ce29f99..b2213f1a6 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/page.tsx
@@ -1,20 +1,11 @@
-import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import type { Metadata } from "next";
import type { Params } from "@/app/[locale]/types";
import { getTranslation } from "@/i18n/server";
-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
import { ProfilePage } from "./profile-page";
-export default async function Page() {
- const helpers = await createPrivateSSRHelper();
- await helpers.user.getAuthed.prefetch();
-
- return (
- <HydrationBoundary state={dehydrate(helpers.queryClient)}>
- <ProfilePage />
- </HydrationBoundary>
- );
+export default function Page() {
+ return <ProfilePage />;
}
export async function generateMetadata(props: {
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
index ec1d8ff70..e8daf4583 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
@@ -18,9 +18,9 @@ import React from "react";
import { useForm } from "react-hook-form";
import * as z from "zod";
import { InputOTP } from "@/components/input-otp";
+import { useAuthedUser } from "@/features/user/components/user-provider";
import { Trans, useTranslation } from "@/i18n/client";
import { authClient } from "@/lib/auth-client";
-import { trpc } from "@/trpc/client";
const emailChangeFormData = z.object({
email: z.email(),
@@ -151,8 +151,7 @@ function VerifyEmailChangeForm({
}
export const ProfileEmailAddress = () => {
- const [user] = trpc.user.getAuthed.useSuspenseQuery();
- const utils = trpc.useUtils();
+ const user = useAuthedUser();
const router = useRouter();
const { t } = useTranslation();
@@ -176,11 +175,12 @@ export const ProfileEmailAddress = () => {
setPendingEmail(null);
reset({ email: user.email });
}}
- onSuccess={async () => {
+ onSuccess={() => {
reset({ email: pendingEmail });
setPendingEmail(null);
setDidChangeEmail(true);
- await utils.user.getAuthed.invalidate();
+ // The change-email endpoint refreshes the session snapshot, so a
+ // refresh re-renders the layouts with the new email.
router.refresh();
}}
/>
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
index d82d864c8..f749905b7 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
@@ -14,9 +14,9 @@ import { useForm } from "react-hook-form";
import * as z from "zod";
import { updateUserNameAction } from "@/features/user/actions";
+import { useAuthedUser } from "@/features/user/components/user-provider";
import { Trans } from "@/i18n/client";
import { useSafeAction } from "@/lib/safe-action/client";
-import { trpc } from "@/trpc/client";
import { ProfilePicture } from "./profile-picture";
@@ -25,7 +25,7 @@ const profileSettingsFormData = z.object({
});
export const ProfileSettings = () => {
- const [user] = trpc.user.getAuthed.useSuspenseQuery();
+ const user = useAuthedUser();
const updateUserName = useSafeAction(updateUserNameAction);
const form = useForm({
diff --git a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
index 8a16bc2e2..c784be240 100644
--- a/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/security/page.tsx
@@ -20,8 +20,8 @@ import {
import { getUserHasPassword } from "@/features/user/data";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
+import { requireUser } from "@/lib/auth";
import { isFeatureEnabled } from "@/lib/feature-flags/server";
-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
import { ChangePasswordForm } from "./components/change-password-form";
import { SetupPasswordForm } from "./components/setup-password-form";
@@ -31,8 +31,7 @@ export default async function SecurityPage({
searchParams: Promise<{ setupPassword?: string }>;
}) {
const { setupPassword } = await searchParams;
- const helpers = await createPrivateSSRHelper();
- const user = await helpers.user.getAuthed.fetch();
+ const user = await requireUser();
const isEmailLoginEnabled = isFeatureEnabled("emailLogin");
const hasPassword = isEmailLoginEnabled
diff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
index 28e4c96e8..99a6e308f 100644
--- a/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/page.tsx
@@ -11,13 +11,14 @@ import {
} from "@/components/settings-layout";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
+import { requireUser } from "@/lib/auth";
import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
import { SpacesList } from "./components/spaces-list";
export default async function Page() {
const helpers = await createPrivateSSRHelper();
const [user, spaces] = await Promise.all([
- helpers.user.getAuthed.fetch(),
+ requireUser(),
helpers.spaces.list.fetch(),
]);
diff --git a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
index 21efc0e51..ffd05907d 100644
--- a/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
+++ b/apps/web/src/app/[locale]/accept-invite/[inviteId]/page.tsx
@@ -6,7 +6,7 @@ import { Logo } from "@/features/branding/components/logo";
import { SpaceIcon } from "@/features/space/components/space-icon";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
+import { requireUser } from "@/lib/auth";
import { AcceptInviteButton } from "./components/accept-invite-button";
import { SignOutButton } from "./components/sign-out-button";
@@ -16,8 +16,7 @@ export default async function JoinPage({
params: Promise<{ inviteId: string }>;
}) {
const { inviteId } = await params;
- const helpers = await createPrivateSSRHelper();
- const user = await helpers.user.getAuthed.fetch();
+ const user = await requireUser();
const invite = await prisma.spaceMemberInvite.findUnique({
where: {
diff --git a/apps/web/src/app/[locale]/control-panel/layout.tsx b/apps/web/src/app/[locale]/control-panel/layout.tsx
index 51ae411e1..876769c33 100644
--- a/apps/web/src/app/[locale]/control-panel/layout.tsx
+++ b/apps/web/src/app/[locale]/control-panel/layout.tsx
@@ -1,10 +1,10 @@
import { Icon } from "@rallly/ui/icon";
import { SidebarInset, SidebarTrigger } from "@rallly/ui/sidebar";
-import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
import { GaugeIcon } from "lucide-react";
import type { Metadata } from "next";
import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";
import { CommandMenu } from "@/features/navigation/components/command-menu";
+import { UserProvider } from "@/features/user/components/user-provider";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
import { getLocale } from "@/i18n/server/get-locale";
@@ -18,14 +18,13 @@ export default async function AdminLayout({
}: {
children: React.ReactNode;
}) {
- const { helpers } = await createAdminSSRHelper();
- const [locale, user] = await Promise.all([
+ const [locale, { user }] = await Promise.all([
getLocale(),
- helpers.user.getAuthed.fetch(),
+ createAdminSSRHelper(),
]);
return (
- <HydrationBoundary state={dehydrate(helpers.queryClient)}>
+ <UserProvider user={user}>
<DateTimeProvider
locale={locale}
timeZone={user.timeZone}
@@ -56,7 +55,7 @@ export default async function AdminLayout({
</SidebarInset>
</ControlPanelSidebarProvider>
</DateTimeProvider>
- </HydrationBoundary>
+ </UserProvider>
);
}
diff --git a/apps/web/src/app/[locale]/control-panel/sidebar.tsx b/apps/web/src/app/[locale]/control-panel/sidebar.tsx
index a450cc93b..72ac25fc6 100644
--- a/apps/web/src/app/[locale]/control-panel/sidebar.tsx
+++ b/apps/web/src/app/[locale]/control-panel/sidebar.tsx
@@ -17,7 +17,7 @@ import {
} from "lucide-react";
import type * as React from "react";
-import { NavUser } from "@/components/nav-user";
+import { NavUser } from "@/features/user/components/nav-user";
import { Trans } from "@/i18n/client";
import { NavItem } from "./nav-item";
diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsx
index a879cb6e0..fc93f8cc5 100644
--- a/apps/web/src/app/[locale]/setup/page.tsx
+++ b/apps/web/src/app/[locale]/setup/page.tsx
@@ -5,11 +5,10 @@ import { CreateSpaceForm } from "@/features/setup/components/create-space-form";
import { userHasSpaces } from "@/features/setup/utils";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
+import { requireUser } from "@/lib/auth";
export default async function SetupPage() {
- const helpers = await createPrivateSSRHelper();
- const user = await helpers.user.getAuthed.fetch();
+ const user = await requireUser();
if (await userHasSpaces(user.id)) {
redirect("/");
diff --git a/apps/web/src/features/space/client.tsx b/apps/web/src/features/space/client.tsx
index adf6d580d..2033f0911 100644
--- a/apps/web/src/features/space/client.tsx
+++ b/apps/web/src/features/space/client.tsx
@@ -5,14 +5,14 @@ import React from "react";
import { getPrimaryColorVars } from "@/features/branding/utils";
import { defineAbilityForMember } from "@/features/space/member/ability";
import type { SpaceDTO } from "@/features/space/types";
-import { trpc } from "@/trpc/client";
+import { useAuthedUser } from "@/features/user/components/user-provider";
import { defineAbilityForSpace } from "./ability";
const SpaceContext = React.createContext<SpaceDTO | null>(null);
export const useSpace = () => {
const space = React.useContext(SpaceContext);
- const [user] = trpc.user.getAuthed.useSuspenseQuery();
+ const user = useAuthedUser();
if (!space) {
throw new Error("useSpace must be used within a SpaceProvider");
diff --git a/apps/web/src/components/nav-user.tsx b/apps/web/src/features/user/components/nav-user.tsx
similarity index 97%
rename from apps/web/src/components/nav-user.tsx
rename to apps/web/src/features/user/components/nav-user.tsx
index e6e2f6b9a..2d2e10adb 100644
--- a/apps/web/src/components/nav-user.tsx
+++ b/apps/web/src/features/user/components/nav-user.tsx
@@ -30,13 +30,13 @@ import { useRouter } from "next/navigation";
import React from "react";
import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";
import { RouterLoadingIndicator } from "@/components/router-loading-indicator";
+import { useUser } from "@/features/user/components/user-provider";
import { Trans } from "@/i18n/client";
import { signOut } from "@/lib/auth-client";
import { useTheme } from "@/lib/theme";
-import { trpc } from "@/trpc/client";
export function NavUser() {
- const { data: user } = trpc.user.getAuthed.useQuery();
+ const { user } = useUser();
const [isPending, setIsPending] = React.useState(false);
const { theme, setTheme } = useTheme();
const router = useRouter();
diff --git a/apps/web/src/features/user/components/user-provider.tsx b/apps/web/src/features/user/components/user-provider.tsx
index c8b1731c2..8b86f0ecd 100644
--- a/apps/web/src/features/user/components/user-provider.tsx
+++ b/apps/web/src/features/user/components/user-provider.tsx
@@ -29,6 +29,27 @@ export function UserProvider({
return <UserContext.Provider value={user}>{children}</UserContext.Provider>;
}
+/**
+ * For components rendered on routes gated by a logged-in (non-guest) user
+ * (e.g. behind requireUser). Throws instead of returning null so consumers
+ * don't need to handle the unauthenticated case.
+ */
+export function useAuthedUser() {
+ const user = React.useContext(UserContext);
+
+ if (user === undefined) {
+ throw new Error("useAuthedUser must be used within a UserProvider");
+ }
+
+ if (!user || user.isGuest) {
+ throw new Error(
+ "useAuthedUser was rendered on a route without a logged in user. Components that call it belong on login-gated routes.",
+ );
+ }
+
+ return user;
+}
+
export function useUser() {
const user = React.useContext(UserContext);
const router = useRouter();
diff --git a/apps/web/src/lib/auth.ts b/apps/web/src/lib/auth.ts
index 53ed7b6f6..a4887a7c9 100644
--- a/apps/web/src/lib/auth.ts
+++ b/apps/web/src/lib/auth.ts
@@ -32,13 +32,16 @@ import type { UserDTO } from "@/features/user/schema";
import { getTranslation } from "@/i18n/server";
import { getLocale } from "@/i18n/server/get-locale";
import { hostOnlyCookieCleanup } from "@/lib/auth-plugins/host-only-cookie-cleanup";
+import { InvalidSessionError } from "@/lib/errors/invalid-session-error";
import { redis } from "@/lib/kv";
import {
LOCALE_COOKIE_NAME,
LOCALE_COOKIE_OPTIONS,
} from "@/lib/locale/constants";
+import { getPathname } from "@/lib/pathname";
import { identifyGroup, track } from "@/lib/posthog";
import { getValueByPath } from "@/lib/utils/get-value-by-path";
+import { buildSafeRedirectUrl } from "@/lib/utils/redirect";
const kv = redis;
@@ -638,6 +641,36 @@ export const getSession = async () => {
return state.status === "authenticated" ? state.session : null;
};
+/**
+ * Gate for server pages that require a logged-in (non-guest) user.
+ * Trusts the session cookie cache (no database read). Redirects to /login
+ * when unauthenticated, fails the render on an unreadable session so a
+ * transient session-store failure can't feed a / ↔ /login redirect loop.
+ */
+export const requireUser = cache(async (): Promise<UserDTO> => {
+ const state = await getSessionState();
+
+ if (state.status === "error") {
+ throw new Error("Failed to read session");
+ }
+
+ const user =
+ state.status === "authenticated" ? state.session.user : undefined;
+
+ if (!user || user.isGuest) {
+ const pathname = await getPathname();
+ redirect(
+ buildSafeRedirectUrl({ destination: "/login", returnUrl: pathname }),
+ );
+ }
+
+ if (user.banned) {
+ throw new InvalidSessionError();
+ }
+
+ return user;
+});
+
export const signOut = async () => {
await authLib.api.signOut({
headers: await headers(),
diff --git a/apps/web/src/trpc/routers/user.ts b/apps/web/src/trpc/routers/user.ts
index 45249bb5b..6dcfd6a20 100644
--- a/apps/web/src/trpc/routers/user.ts
+++ b/apps/web/src/trpc/routers/user.ts
@@ -10,9 +10,6 @@ import { track } from "@/lib/posthog";
import { privateProcedure, router } from "../trpc";
export const user = router({
- getAuthed: privateProcedure.query(async ({ ctx }) => {
- return ctx.user;
- }),
deleteMe: privateProcedure.mutation(async ({ ctx }) => {
const userId = ctx.user.id;
diff --git a/apps/web/src/trpc/server/create-ssr-helper.ts b/apps/web/src/trpc/server/create-ssr-helper.ts
index f1f56bd1a..f5b9b9813 100644
--- a/apps/web/src/trpc/server/create-ssr-helper.ts
+++ b/apps/web/src/trpc/server/create-ssr-helper.ts
@@ -4,8 +4,7 @@ import { cache } from "react";
import superjson from "superjson";
import { isInitialAdmin } from "@/features/setup/utils";
import { getCurrentUser } from "@/features/user/data";
-import { getSession, getSessionState } from "@/lib/auth";
-import { InvalidSessionError } from "@/lib/errors/invalid-session-error";
+import { getSession, requireUser } from "@/lib/auth";
import { getPathname } from "@/lib/pathname";
import { buildSafeRedirectUrl } from "@/lib/utils/redirect";
import type { TRPCContext } from "../context";
@@ -36,29 +35,7 @@ export const createPublicSSRHelper = cache(async () => {
* Redirects to /login if the user is not authenticated or is a guest.
*/
export const createPrivateSSRHelper = cache(async () => {
- const state = await getSessionState();
-
- // An unreadable session (store unreachable, transient failure) is not
- // "logged out". Redirecting to /login on it is one leg of the / ↔ /login
- // redirect loop — fail the render instead so the user gets
- // the error boundary's retry page.
- if (state.status === "error") {
- throw new Error("Failed to read session");
- }
-
- const user =
- state.status === "authenticated" ? state.session.user : undefined;
-
- if (!user || user.isGuest) {
- const pathname = await getPathname();
- redirect(
- buildSafeRedirectUrl({ destination: "/login", returnUrl: pathname }),
- );
- }
-
- if (user.banned) {
- throw new InvalidSessionError();
- }
+ const user = await requireUser();
return createServerSideHelpers({
router: appRouter,