Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
π Fix login redirect loop when session user no longer exists (#2538)
Luke Vella84fb0bf440fe
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsxindex 77780b3eb..292690c92 100644--- a/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/page.tsx@@ -1,4 +1,5 @@import type { Metadata } from "next";+import { redirect } from "next/navigation";import { DateTimePreferences } from "@/app/[locale]/(space)/settings/preferences/components/date-time-preferences";import { LanguagePreference } from "@/app/[locale]/(space)/settings/preferences/components/language-preference";import { ThemePreference } from "@/app/[locale]/(space)/settings/preferences/components/theme-preference";@@ -18,16 +19,22 @@ import {SettingsPageHeader,SettingsPageTitle,} from "@/app/components/settings-layout";-import { getCurrentUser } from "@/auth/data";+import { getCurrentUser } from "@/features/user/data";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";-import { InvalidSessionError } from "@/lib/errors/invalid-session-error";+import { getPathname } from "@/lib/pathname";+import { buildSafeRedirectUrl } from "@/utils/redirect";export default async function Page() {const user = await getCurrentUser();if (!user) {- throw new InvalidSessionError();+ redirect(+ buildSafeRedirectUrl({+ destination: "/login",+ returnUrl: await getPathname(),+ }),+ );}return (diff --git a/apps/web/src/app/api/stripe/checkout/route.ts b/apps/web/src/app/api/stripe/checkout/route.tsindex 5c54c6a68..42f567c5e 100644--- a/apps/web/src/app/api/stripe/checkout/route.ts+++ b/apps/web/src/app/api/stripe/checkout/route.ts@@ -1,5 +1,4 @@import { getProPricing, stripe } from "@rallly/billing";-import { prisma } from "@rallly/database";import { absoluteUrl } from "@rallly/utils/absolute-url";import type { NextRequest } from "next/server";import { NextResponse } from "next/server";@@ -10,8 +9,9 @@ import type {SubscriptionCheckoutMetadata,SubscriptionMetadata,} from "@/features/subscription/schema";-import { getUser } from "@/features/user/data";-import { getSession } from "@/lib/auth";+import { getCurrentUser } from "@/features/user/data";+import type { UserDTO } from "@/features/user/schema";+import { InvalidSessionError } from "@/lib/errors/invalid-session-error";const inputSchema = z.object({period: z.enum(["monthly", "yearly"]).optional(),@@ -19,16 +19,19 @@ const inputSchema = z.object({});export async function POST(request: NextRequest) {- const session = await getSession();-- if (!session?.user || session.user.isGuest) {- return NextResponse.redirect(absoluteUrl("/login"), 303);+ let user: UserDTO | null;++ try {+ user = await getCurrentUser();+ } catch (error) {+ if (!(error instanceof InvalidSessionError)) {+ throw error;+ }+ return NextResponse.json({ error: "User not found" }, { status: 404 });}- const user = await getUser(session.user.id);-if (!user) {- return NextResponse.json({ error: "User not found" }, { status: 404 });+ return NextResponse.redirect(absoluteUrl("/login"), 303);}const space = await getActiveSpaceForUser(user.id);@@ -56,22 +59,13 @@ export async function POST(request: NextRequest) {let customerId: string;- const res = await prisma.user.findUniqueOrThrow({- where: {- id: user.id,- },- select: {- customerId: true,- },- });-if (space.tier === "pro") {// User already has an active subscription. Take them to customer portalreturn NextResponse.redirect(absoluteUrl("/api/stripe/portal"), 303);}- if (res.customerId) {- customerId = res.customerId;+ if (user.customerId) {+ customerId = user.customerId;} else {// create a new customer in stripeconst customer = await stripe.customers.create(diff --git a/apps/web/src/app/api/trpc/[trpc]/route.ts b/apps/web/src/app/api/trpc/[trpc]/route.tsindex 30039e346..66db1a28f 100644--- a/apps/web/src/app/api/trpc/[trpc]/route.ts+++ b/apps/web/src/app/api/trpc/[trpc]/route.ts@@ -4,14 +4,14 @@ import { fetchRequestHandler } from "@trpc/server/adapters/fetch";import { getHTTPStatusCodeFromError } from "@trpc/server/http";import { ipAddress } from "@vercel/functions";import type { NextRequest } from "next/server";-import { getUserSession } from "@/features/user/data";+import { getSession } from "@/lib/auth";import { getLocaleFromRequest } from "@/lib/locale/server";import type { TRPCContext } from "@/trpc/context";import { appRouter } from "@/trpc/routers";import { withPostHog } from "@/utils/posthog";const handler = async (req: NextRequest) => {- const { user } = await getUserSession();+ const session = await getSession();const ip = ipAddress(req) ?? "127.0.0.1";const ja4Digest = req.headers.get("x-vercel-ja4-digest") ?? undefined;const reqLocale = getLocaleFromRequest(req);@@ -29,9 +29,9 @@ const handler = async (req: NextRequest) => {});// User context- if (user) {- event.userId = user.id;- event.isGuest = user.isGuest;+ if (session?.user) {+ event.userId = session.user.id;+ event.isGuest = session.user.isGuest;}try {@@ -40,12 +40,12 @@ const handler = async (req: NextRequest) => {req,router: appRouter,createContext: async () => {- const locale = user?.locale ?? reqLocale;+ const locale = reqLocale;- const identifier = user?.id ?? ja4Digest ?? ip;+ const identifier = session?.user?.id ?? ja4Digest ?? ip;return {- user,+ user: session?.user,locale,identifier,event,diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.tsdeleted file mode 100644index 647dd56a0..000000000--- a/apps/web/src/auth/data.ts+++ /dev/null@@ -1,24 +0,0 @@-import "server-only";--import { getUser } from "@/features/user/data";-import { getSession } from "@/lib/auth";--/**- * Gets the current user if they are logged in, otherwise null.- * @returns The current user if they are logged in, otherwise null.- */-export const getCurrentUser = async () => {- const session = await getSession();-- if (!session?.user || session.user.isGuest) {- return null;- }-- const user = await getUser(session.user.id);-- if (!user) {- return null;- }-- return user;-};diff --git a/apps/web/src/features/user/data.ts b/apps/web/src/features/user/data.tsindex 5c7215892..42ab54071 100644--- a/apps/web/src/features/user/data.ts+++ b/apps/web/src/features/user/data.ts@@ -1,7 +1,9 @@import type { User } from "@rallly/database";import { prisma } from "@rallly/database";+import { cache } from "react";import type { UserDTO } from "@/features/user/schema";import { getSession } from "@/lib/auth";+import { InvalidSessionError } from "@/lib/errors/invalid-session-error";export const createUserDTO = (user: User): UserDTO => ({id: user.id,@@ -18,38 +20,29 @@ export const createUserDTO = (user: User): UserDTO => ({isGuest: user.isAnonymous,});-const createGuestDTO = (session: {- id: string;- name: string;- email: string;- image?: string | null;- locale?: string;- timeZone?: string;-}): UserDTO => ({- id: session.id,- name: session.name,- email: session.email,- image: session.image ?? undefined,- role: "user",- banned: false,- isGuest: true,- locale: session.locale,- timeZone: session.timeZone || undefined,-});+/**+ * The current signed-in user, fetched from the database. Returns null+ * when there is no session or the user is a guest β the caller decides+ * how to respond (redirect, 401, etc.). Throws InvalidSessionError when+ * the session references a user that no longer exists or is banned.+ */+export const getCurrentUser = cache(async () => {+ const session = await getSession();++ if (!session?.user || session.user.isGuest) {+ return null;+ }-export const getUser = async (id: string) => {const user = await prisma.user.findUnique({- where: {- id,- },+ where: { id: session.user.id },});- if (!user) {- return null;+ if (!user || user.banned) {+ throw new InvalidSessionError();}return createUserDTO(user);-};+});export function getUserProfile(userId: string) {return prisma.user.findUnique({@@ -60,17 +53,3 @@ export function getUserProfile(userId: string) {},});}--export const getUserSession = async () => {- const session = await getSession();-- if (!session?.user) {- return { session: null, user: undefined };- }-- const user = session.user.isGuest- ? createGuestDTO(session.user)- : ((await getUser(session.user.id)) ?? undefined);-- return { session, user };-};diff --git a/apps/web/src/lib/auth.ts b/apps/web/src/lib/auth.tsindex f0961e7eb..58c13a76a 100644--- a/apps/web/src/lib/auth.ts+++ b/apps/web/src/lib/auth.ts@@ -1,4 +1,5 @@import { stripe } from "@rallly/billing";+import type { TimeFormat } from "@rallly/database";import { prisma } from "@rallly/database";import { sendChangeEmailEmail } from "@rallly/emails/templates/change-email";import { sendRegisterEmail } from "@rallly/emails/templates/register";@@ -30,6 +31,7 @@ import { getInstanceBranding } from "@/emails/branding";import { env } from "@/env";import { posthog } from "@/features/analytics/posthog";import { createSpace } from "@/features/space/mutations";+import type { UserDTO } from "@/features/user/schema";import { getTranslation } from "@/i18n/server";import { getLocale } from "@/i18n/server/get-locale";import { redis } from "@/lib/kv";@@ -501,6 +503,9 @@ export const authLib = betterAuth({export type Auth = typeof authLib;+const parseTimeFormat = (value: unknown): TimeFormat | undefined =>+ value === "hours12" || value === "hours24" ? value : undefined;+export const getSession = cache(async () => {try {const session = await authLib.api.getSession({@@ -508,18 +513,22 @@ export const getSession = cache(async () => {});if (session) {+ const user: UserDTO = {+ id: session.user.id,+ email: session.user.email,+ name: session.user.name,+ isGuest: !!session.user.isAnonymous,+ image: session.user.image ?? undefined,+ role: session.user.role === "admin" ? "admin" : "user",+ banned: !!session.user.banned,+ locale: session.user.locale ?? undefined,+ timeZone: session.user.timeZone || undefined,+ timeFormat: parseTimeFormat(session.user.timeFormat),+ weekStart: session.user.weekStart ?? undefined,+ };+return {- user: {- id: session.user.id,- email: session.user.email,- name: session.user.name,- isGuest: !!session.user.isAnonymous,- image: session.user.image,- locale: session.user.locale ?? undefined,- timeZone: session.user.timeZone || undefined,- timeFormat: session.user.timeFormat ?? undefined,- weekStart: session.user.weekStart ?? undefined,- },+ user,expires: session.session.expiresAt.toISOString(),updatedAt: session.session.updatedAt.toISOString(),};diff --git a/apps/web/src/lib/errors/invalid-session-error.ts b/apps/web/src/lib/errors/invalid-session-error.tsindex 570a6854c..be6420699 100644--- a/apps/web/src/lib/errors/invalid-session-error.ts+++ b/apps/web/src/lib/errors/invalid-session-error.ts@@ -1,13 +1,16 @@export const INVALID_SESSION = "INVALID_SESSION";/**- * Thrown from SSR helpers when a session exists but the user is- * missing from the database or banned. Next.js strips custom error- * properties when serializing server errors to the client, but- * preserves `digest`. We set it to a known constant so the client- * error boundary can identify this error and revoke the session.- * This is undocumented behavior and may break in a future version- * of React/Next.js.+ * Domain error thrown when a session references a user that is missing+ * from the database or banned. Each transport adapts it to its own+ * protocol: server actions revoke the session in handleServerError,+ * route handlers map it to an error response. Server components can't+ * write cookies, so the client error boundary revokes the session+ * instead β Next.js strips custom error properties when serializing+ * server errors but preserves `digest`, which we set to a known+ * constant so the boundary can identify this error. The digest+ * behavior is undocumented and may break in a future version of+ * React/Next.js.*/export class InvalidSessionError extends Error {digest = INVALID_SESSION;diff --git a/apps/web/src/lib/safe-action/server.ts b/apps/web/src/lib/safe-action/server.tsindex 4f09042c6..474484cc1 100644--- a/apps/web/src/lib/safe-action/server.ts+++ b/apps/web/src/lib/safe-action/server.ts@@ -3,9 +3,11 @@ import "server-only";import * as Sentry from "@sentry/nextjs";import { createMiddleware, createSafeActionClient } from "next-safe-action";import * as z from "zod";-import { getCurrentUser } from "@/auth/data";import { defineAbilityFor } from "@/features/user/ability";+import { getCurrentUser } from "@/features/user/data";+import { signOut } from "@/lib/auth";import { AppError } from "@/lib/errors";+import { InvalidSessionError } from "@/lib/errors/invalid-session-error";import type { Duration } from "@/lib/rate-limit";import { createRatelimit } from "@/lib/rate-limit";@@ -44,7 +46,20 @@ export const actionClient = createSafeActionClient({z.object({actionName: z.string(),}),- handleServerError: (error, { metadata }) => {+ handleServerError: async (error, { metadata }) => {+ if (error instanceof InvalidSessionError) {+ // Expected condition, not reported to Sentry. Unlike server+ // components, server actions can write cookies, so revoke the+ // stale session directly instead of delegating to the client+ // error boundary.+ try {+ await signOut();+ } catch {+ // The error response must be returned regardless+ }+ return "UNAUTHORIZED" as const;+ }+Sentry.captureException(error, {tags: {errorHandler: "safe-action",diff --git a/apps/web/src/trpc/server/create-ssr-helper.ts b/apps/web/src/trpc/server/create-ssr-helper.tsindex 30f6d8536..9c16c510b 100644--- a/apps/web/src/trpc/server/create-ssr-helper.ts+++ b/apps/web/src/trpc/server/create-ssr-helper.ts@@ -2,7 +2,7 @@ import { createServerSideHelpers } from "@trpc/react-query/server";import { notFound, redirect } from "next/navigation";import { cache } from "react";import superjson from "superjson";-import { getUserSession } from "@/features/user/data";+import { getSession } from "@/lib/auth";import { InvalidSessionError } from "@/lib/errors/invalid-session-error";import { getPathname } from "@/lib/pathname";import { isInitialAdmin } from "@/utils/is-initial-admin";@@ -18,7 +18,7 @@ import { appRouter } from "../routers";* @see https://trpc.io/docs/client/nextjs/server-side-helpers#1-internal-router*/export const createPublicSSRHelper = cache(async () => {- const { user } = await getUserSession();+ const user = (await getSession())?.user;return createServerSideHelpers({router: appRouter,@@ -35,11 +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 { user, session } = await getUserSession();-- if (session && !user) {- throw new InvalidSessionError();- }+ const user = (await getSession())?.user;if (!user || user.isGuest) {const pathname = await getPathname();@@ -69,7 +65,7 @@ export const createPrivateSSRHelper = cache(async () => {* is not an admin.*/export const createAdminSSRHelper = cache(async () => {- const { user } = await getUserSession();+ const user = (await getSession())?.user;if (!user || user.isGuest) {redirect(diff --git a/apps/web/src/trpc/trpc.ts b/apps/web/src/trpc/trpc.tsindex d14f2384a..0db9b38ee 100644--- a/apps/web/src/trpc/trpc.ts+++ b/apps/web/src/trpc/trpc.ts@@ -1,7 +1,10 @@+import { prisma } from "@rallly/database";import { initTRPC, TRPCError } from "@trpc/server";import superjson from "superjson";import { isQuickCreateEnabled } from "@/features/quick-create";import { getActiveSpaceForUser } from "@/features/space/data";+import { createUserDTO } from "@/features/user/data";+import { signOut } from "@/lib/auth";import { AppError } from "@/lib/errors";import { createRatelimit } from "@/lib/rate-limit";import { isSelfHosted } from "@/utils/constants";@@ -25,7 +28,39 @@ export const router = t.router;export const middleware = t.middleware;-export const publicProcedure = t.procedure;+// Reads trust the session (cookie cache) without hitting the database.+// Mutations verify the user still exists and run with a fresh DTO; if the+// user is gone, the session is revoked so the client can't keep bouncing+// between the login page and pages that require an account.+const mutationSessionGuard = t.middleware(async ({ ctx, type, next }) => {+ if (type !== "mutation" || !ctx.user) {+ return next();+ }++ const user = await prisma.user.findUnique({+ where: { id: ctx.user.id },+ });++ if (!user) {+ try {+ await signOut();+ } catch {+ // The UNAUTHORIZED error below must be thrown regardless+ }+ throw new TRPCError({+ code: "UNAUTHORIZED",+ message: "Your session is no longer valid",+ });+ }++ return next({+ ctx: {+ user: createUserDTO(user),+ },+ });+});++export const publicProcedure = t.procedure.use(mutationSessionGuard);export const possiblyPublicProcedure = publicProcedure.use(middleware(async ({ ctx, next }) => {@@ -111,7 +146,7 @@ export const spaceProcedure = privateProcedure.use(async ({ ctx, next }) => {export const proProcedure = spaceProcedure.use(async ({ ctx, next }) => {if (!isSelfHosted && ctx.space.tier !== "pro") {throw new TRPCError({- code: "UNAUTHORIZED",+ code: "PAYMENT_REQUIRED",message:"You must have an active paid subscription to perform this action",});