Skip to content

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

♻️ Replace requireAdmin() with tRPC data fetching (RAL-1018) (#2235)

Luke Vellab8cc9aa1741e
diff --git a/apps/web/src/app/[locale]/control-panel/setup/actions.ts b/apps/web/src/app/[locale]/admin-setup/actions.ts
similarity index 100%
rename from apps/web/src/app/[locale]/control-panel/setup/actions.ts
rename to apps/web/src/app/[locale]/admin-setup/actions.ts
diff --git a/apps/web/src/app/[locale]/control-panel/setup/make-me-admin-button.tsx b/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/control-panel/setup/make-me-admin-button.tsx
rename to apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx
diff --git a/apps/web/src/app/[locale]/control-panel/setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsx
similarity index 100%
rename from apps/web/src/app/[locale]/control-panel/setup/page.tsx
rename to apps/web/src/app/[locale]/admin-setup/page.tsx
diff --git a/apps/web/src/app/[locale]/control-panel/branding/page.tsx b/apps/web/src/app/[locale]/control-panel/branding/page.tsx
index 307d3a92e..aa80429d0 100644
--- a/apps/web/src/app/[locale]/control-panel/branding/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/branding/page.tsx
@@ -18,7 +18,6 @@ import {
SettingsPageHeader,
SettingsPageTitle,
} from "@/app/components/settings-layout";
-import { requireAdmin } from "@/auth/data";
import { getCustomBrandingConfig } from "@/features/branding/queries";
import { loadInstanceLicense } from "@/features/licensing/data";
import { Trans } from "@/i18n/client";
@@ -28,7 +27,6 @@ async function loadData() {
const [license, brandingConfig] = await Promise.all([
loadInstanceLicense(),
getCustomBrandingConfig(),
- requireAdmin(),
]);
return {
diff --git a/apps/web/src/app/[locale]/control-panel/layout.tsx b/apps/web/src/app/[locale]/control-panel/layout.tsx
index 41a85f771..6feab3702 100644
--- a/apps/web/src/app/[locale]/control-panel/layout.tsx
+++ b/apps/web/src/app/[locale]/control-panel/layout.tsx
@@ -7,7 +7,7 @@ import { LicenseLimitWarning } from "@/features/licensing/components/license-lim
import { CommandMenu } from "@/features/navigation/command-menu";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";
+import { createAdminSSRHelper } from "@/trpc/server/create-ssr-helper";
import { ControlPanelSidebarProvider } from "./control-panel-sidebar-provider";
import { ControlPanelSidebar } from "./sidebar";
@@ -16,7 +16,7 @@ export default async function AdminLayout({
}: {
children: React.ReactNode;
}) {
- const helpers = await createPrivateSSRHelper();
+ const { helpers } = await createAdminSSRHelper();
await helpers.user.getAuthed.prefetch();
return (
diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsx
index 91ddc0e0c..9d8a86be6 100644
--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx
@@ -24,7 +24,6 @@ import {
SettingsPageHeader,
SettingsPageTitle,
} from "@/app/components/settings-layout";
-import { requireAdmin } from "@/auth/data";
import {
DescriptionList,
DescriptionListTitle,
@@ -46,7 +45,7 @@ import { getTranslation } from "@/i18n/server";
import { dayjs } from "@/lib/dayjs";
async function loadData() {
- const [license] = await Promise.all([loadInstanceLicense(), requireAdmin()]);
+ const license = await loadInstanceLicense();
return { license };
}
diff --git a/apps/web/src/app/[locale]/control-panel/page.tsx b/apps/web/src/app/[locale]/control-panel/page.tsx
index af215c6f9..b22f42c4b 100644
--- a/apps/web/src/app/[locale]/control-panel/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/page.tsx
@@ -17,15 +17,12 @@ import {
SettingsPageHeader,
SettingsPageTitle,
} from "@/app/components/settings-layout";
-import { requireAdmin } from "@/auth/data";
import { DEFAULT_SEAT_LIMIT } from "@/features/licensing/constants";
import { loadInstanceLicense } from "@/features/licensing/data";
import { getUserCount } from "@/features/user/queries";
import { Trans } from "@/i18n/client";
async function loadData() {
- await requireAdmin();
-
const [userCount, license] = await Promise.all([
getUserCount(),
loadInstanceLicense(),
diff --git a/apps/web/src/app/[locale]/control-panel/settings/page.tsx b/apps/web/src/app/[locale]/control-panel/settings/page.tsx
index a1170459c..e85751ebf 100644
--- a/apps/web/src/app/[locale]/control-panel/settings/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/settings/page.tsx
@@ -13,16 +13,12 @@ import {
SettingsPageHeader,
SettingsPageTitle,
} from "@/app/components/settings-layout";
-import { requireAdmin } from "@/auth/data";
import { getInstanceSettings } from "@/features/instance-settings/queries";
import { Trans } from "@/i18n/client";
import { InstanceSettingsForm } from "./instance-settings-form";
async function loadData() {
- const [instanceSettings] = await Promise.all([
- getInstanceSettings(),
- requireAdmin(),
- ]);
+ const instanceSettings = await getInstanceSettings();
return {
instanceSettings,
diff --git a/apps/web/src/app/[locale]/control-panel/users/page.tsx b/apps/web/src/app/[locale]/control-panel/users/page.tsx
index ccb8aab89..f9af016d6 100644
--- a/apps/web/src/app/[locale]/control-panel/users/page.tsx
+++ b/apps/web/src/app/[locale]/control-panel/users/page.tsx
@@ -11,7 +11,6 @@ import {
SettingsPageHeader,
SettingsPageTitle,
} from "@/app/components/settings-layout";
-import { requireAdmin } from "@/auth/data";
import {
EmptyState,
EmptyStateDescription,
@@ -23,6 +22,7 @@ import { StackedList } from "@/components/stacked-list";
import { defineAbilityFor } from "@/features/user/ability";
import { Trans } from "@/i18n/client";
import { getTranslation } from "@/i18n/server";
+import { createAdminSSRHelper } from "@/trpc/server/create-ssr-helper";
import { UserRow } from "./user-row";
import { UserSearchInput } from "./user-search-input";
import { UsersTabbedView } from "./users-tabbed-view";
@@ -38,7 +38,7 @@ async function loadData({
q?: string;
role?: "admin" | "user";
}) {
- const user = await requireAdmin();
+ const { user } = await createAdminSSRHelper();
const where: Prisma.UserWhereInput = {
isAnonymous: false,
diff --git a/apps/web/src/app/[locale]/error.tsx b/apps/web/src/app/[locale]/error.tsx
index 4d79ffe6e..21da31b6a 100644
--- a/apps/web/src/app/[locale]/error.tsx
+++ b/apps/web/src/app/[locale]/error.tsx
@@ -4,10 +4,13 @@ import { Button } from "@rallly/ui/button";
import * as Sentry from "@sentry/nextjs";
import { GithubIcon, HomeIcon, LifeBuoyIcon, PlusIcon } from "lucide-react";
import Link from "next/link";
+import { useRouter } from "next/navigation";
import React from "react";
-
import { ErrorPage, ErrorPageLinkItem } from "@/components/error-page";
+import { RouterLoadingIndicator } from "@/components/router-loading-indicator";
import { Trans } from "@/i18n/client";
+import { authClient } from "@/lib/auth-client";
+import { INVALID_SESSION } from "@/lib/errors/invalid-session-error";
export default function LocaleErrorBoundary({
error,
@@ -16,9 +19,27 @@ export default function LocaleErrorBoundary({
error: Error & { digest?: string };
reset: () => void;
}) {
+ const router = useRouter();
+ const isInvalidSession = error.digest === INVALID_SESSION;
+
React.useEffect(() => {
+ if (isInvalidSession) {
+ authClient.signOut({
+ fetchOptions: {
+ onSuccess: () => {
+ router.push("/login");
+ },
+ },
+ });
+ return;
+ }
+
Sentry.captureException(error);
- }, [error]);
+ }, [error, router, isInvalidSession]);
+
+ if (isInvalidSession) {
+ return <RouterLoadingIndicator />;
+ }
return (
<ErrorPage
diff --git a/apps/web/src/app/api/auth/invalid-session/route.ts b/apps/web/src/app/api/auth/invalid-session/route.ts
deleted file mode 100644
index 3b0643709..000000000
--- a/apps/web/src/app/api/auth/invalid-session/route.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { createLogger } from "@rallly/logger";
-import type { NextRequest } from "next/server";
-import { NextResponse } from "next/server";
-import auth from "@/lib/auth";
-
-const logger = createLogger("api/auth/invalid-session");
-
-export async function GET(req: NextRequest) {
- try {
- await auth.api.signOut({
- headers: req.headers,
- });
- } catch (error) {
- logger.error({ error }, "Failed to sign out");
- }
-
- return NextResponse.redirect(new URL("/login", req.url));
-}
diff --git a/apps/web/src/app/api/trpc/[trpc]/route.ts b/apps/web/src/app/api/trpc/[trpc]/route.ts
index 33583c57d..c06e06257 100644
--- a/apps/web/src/app/api/trpc/[trpc]/route.ts
+++ b/apps/web/src/app/api/trpc/[trpc]/route.ts
@@ -5,13 +5,13 @@ import { getHTTPStatusCodeFromError } from "@trpc/server/http";
import { ipAddress } from "@vercel/functions";
import type { NextRequest } from "next/server";
-import { getSession } from "@/lib/auth";
+import { getUserSession } from "@/features/user/data";
import { getLocaleFromRequest } from "@/lib/locale/server";
import type { TRPCContext } from "@/trpc/context";
import { appRouter } from "@/trpc/routers";
const handler = async (req: NextRequest) => {
- const session = await getSession();
+ const { user } = await getUserSession();
const ip = ipAddress(req);
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 (session?.user) {
- event.userId = session.user.id;
- event.isGuest = session.user.isGuest;
+ if (user) {
+ event.userId = user.id;
+ event.isGuest = user.isGuest;
}
try {
@@ -40,19 +40,9 @@ const handler = async (req: NextRequest) => {
req,
router: appRouter,
createContext: async () => {
- const locale = session?.user?.locale ?? reqLocale;
+ const locale = user?.locale ?? reqLocale;
- const user = session?.user
- ? {
- id: session.user.id,
- isGuest: session.user.isGuest,
- locale,
- image: session.user.image ?? undefined,
- timeZone: session.user.timeZone ?? undefined,
- }
- : undefined;
-
- const identifier = session?.user?.id ?? ja4Digest ?? ip;
+ const identifier = user?.id ?? ja4Digest ?? ip;
return {
user,
diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.ts
index ecb5cdf29..4df6a80b3 100644
--- a/apps/web/src/auth/data.ts
+++ b/apps/web/src/auth/data.ts
@@ -1,15 +1,10 @@
import "server-only";
import { prisma } from "@rallly/database";
-import { notFound, redirect } from "next/navigation";
-import { cache } from "react";
import { createSpaceDTO } from "@/features/space/data";
import { getUser } from "@/features/user/data";
import { getSession } from "@/lib/auth";
import { AppError } from "@/lib/errors";
-import { getPathname } from "@/lib/pathname";
-import { isInitialAdmin } from "@/utils/is-initial-admin";
-import { buildSafeRedirectUrl } from "@/utils/redirect";
/**
* Gets the current user if they are logged in, otherwise null.
@@ -76,32 +71,3 @@ export const getCurrentUserSpace = async () => {
}),
};
};
-
-export const requireAdmin = cache(async () => {
- const session = await getSession();
-
- if (!session?.user || session.user.isGuest) {
- redirect(
- buildSafeRedirectUrl({
- destination: "/login",
- returnUrl: await getPathname(),
- }),
- );
- }
-
- const user = await getUser(session.user.id);
-
- if (!user) {
- redirect("/api/auth/invalid-session");
- }
-
- if (user.role !== "admin") {
- if (isInitialAdmin(user.email)) {
- redirect("/control-panel/setup");
- }
-
- notFound();
- }
-
- return user;
-});
diff --git a/apps/web/src/features/user/data.ts b/apps/web/src/features/user/data.ts
index a6a684df2..0c2a91407 100644
--- a/apps/web/src/features/user/data.ts
+++ b/apps/web/src/features/user/data.ts
@@ -2,6 +2,7 @@ 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";
export const createUserDTO = (user: User): UserDTO => ({
id: user.id,
@@ -9,6 +10,7 @@ export const createUserDTO = (user: User): UserDTO => ({
image: user.image ?? undefined,
email: user.email,
role: user.role,
+ banned: user.banned,
timeZone: user.timeZone ?? undefined,
timeFormat: user.timeFormat ?? undefined,
locale: user.locale ?? undefined,
@@ -17,7 +19,26 @@ export const createUserDTO = (user: User): UserDTO => ({
isGuest: user.isAnonymous,
});
-export const getUser = cache(async (id: string) => {
+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,
+});
+
+export const getUser = async (id: string) => {
const user = await prisma.user.findUnique({
where: {
id,
@@ -29,4 +50,18 @@ export const getUser = cache(async (id: string) => {
}
return createUserDTO(user);
+};
+
+export const getUserSession = cache(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/features/user/schema.ts b/apps/web/src/features/user/schema.ts
index 794b07455..88e2a7c9e 100644
--- a/apps/web/src/features/user/schema.ts
+++ b/apps/web/src/features/user/schema.ts
@@ -11,6 +11,7 @@ export type UserDTO = {
image?: string;
email: string;
role: UserRole;
+ banned: boolean;
isGuest: boolean;
timeZone?: string;
timeFormat?: TimeFormat;
diff --git a/apps/web/src/lib/errors/invalid-session-error.ts b/apps/web/src/lib/errors/invalid-session-error.ts
new file mode 100644
index 000000000..570a6854c
--- /dev/null
+++ b/apps/web/src/lib/errors/invalid-session-error.ts
@@ -0,0 +1,19 @@
+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.
+ */
+export class InvalidSessionError extends Error {
+ digest = INVALID_SESSION;
+
+ constructor() {
+ super("Invalid session");
+ this.name = "InvalidSessionError";
+ }
+}
diff --git a/apps/web/src/trpc/context.ts b/apps/web/src/trpc/context.ts
index 606c24a66..d5b560924 100644
--- a/apps/web/src/trpc/context.ts
+++ b/apps/web/src/trpc/context.ts
@@ -1,16 +1,9 @@
import type { WideEvent } from "@rallly/logger";
-
-export type User = {
- id: string;
- isGuest: boolean;
- locale?: string;
- image?: string;
- timeZone?: string;
-};
+import type { UserDTO } from "@/features/user/schema";
export type TRPCContext = {
- user?: User;
+ user?: UserDTO;
locale?: string;
identifier?: string;
- event: WideEvent;
+ event?: WideEvent;
};
diff --git a/apps/web/src/trpc/routers/spaces.ts b/apps/web/src/trpc/routers/spaces.ts
index 7165557c3..9699d10c2 100644
--- a/apps/web/src/trpc/routers/spaces.ts
+++ b/apps/web/src/trpc/routers/spaces.ts
@@ -1,12 +1,11 @@
import { prisma } from "@rallly/database";
import { createSpaceDTO } from "@/features/space/data";
import type { SpaceDTO } from "@/features/space/types";
-import { getUser } from "@/features/user/data";
import { privateProcedure, router } from "../trpc";
export const spaces = router({
list: privateProcedure.query(async ({ ctx }) => {
- const user = await getUser(ctx.user.id);
+ const { user } = ctx;
if (!user) {
return [];
diff --git a/apps/web/src/trpc/routers/user.ts b/apps/web/src/trpc/routers/user.ts
index ef9f14d42..5f370db7f 100644
--- a/apps/web/src/trpc/routers/user.ts
+++ b/apps/web/src/trpc/routers/user.ts
@@ -2,7 +2,6 @@ import { prisma } from "@rallly/database";
import { absoluteUrl } from "@rallly/utils/absolute-url";
import { TRPCError } from "@trpc/server";
import * as z from "zod";
-import { getUser } from "@/features/user/data";
import {
deleteImageFromS3,
getImageUploadUrl,
@@ -22,19 +21,10 @@ export const user = router({
return null;
}
- return await getUser(ctx.user.id);
+ return ctx.user;
}),
getAuthed: privateProcedure.query(async ({ ctx }) => {
- const user = await getUser(ctx.user.id);
-
- if (!user) {
- throw new TRPCError({
- code: "NOT_FOUND",
- message: "User not found",
- });
- }
-
- return user;
+ return ctx.user;
}),
changeName: privateProcedure
.input(
diff --git a/apps/web/src/trpc/server/create-ssr-helper.ts b/apps/web/src/trpc/server/create-ssr-helper.ts
index ff6789170..9b17a0d9c 100644
--- a/apps/web/src/trpc/server/create-ssr-helper.ts
+++ b/apps/web/src/trpc/server/create-ssr-helper.ts
@@ -1,9 +1,11 @@
-import { createWideEvent } from "@rallly/logger";
import { createServerSideHelpers } from "@trpc/react-query/server";
-import { redirect } from "next/navigation";
+import { notFound, redirect } from "next/navigation";
+import { cache } from "react";
import superjson from "superjson";
-import { getSession } from "@/lib/auth";
+import { getUserSession } from "@/features/user/data";
+import { InvalidSessionError } from "@/lib/errors/invalid-session-error";
import { getPathname } from "@/lib/pathname";
+import { isInitialAdmin } from "@/utils/is-initial-admin";
import { buildSafeRedirectUrl } from "@/utils/redirect";
import type { TRPCContext } from "../context";
import { appRouter } from "../routers";
@@ -15,61 +17,84 @@ import { appRouter } from "../routers";
* Note: Using this makes the page dynamic (not cached).
* @see https://trpc.io/docs/client/nextjs/server-side-helpers#1-internal-router
*/
-export const createPublicSSRHelper = async () => {
- const session = await getSession();
- const event = createWideEvent({
- service: "trpc",
- });
+export const createPublicSSRHelper = cache(async () => {
+ const { user } = await getUserSession();
return createServerSideHelpers({
router: appRouter,
ctx: {
- user: session?.user
- ? {
- id: session.user.id,
- isGuest: session.user.isGuest,
- locale: session.user.locale ?? undefined,
- image: session.user.image ?? undefined,
- timeZone: session.user.timeZone ?? undefined,
- }
- : undefined,
- event,
+ user,
} satisfies TRPCContext,
transformer: superjson,
});
-};
+});
/**
* Private Server-Side Helper
* @description Use for prefetching data that requires a logged-in (non-guest) user.
* Redirects to /login if the user is not authenticated or is a guest.
*/
-export const createPrivateSSRHelper = async () => {
- const session = await getSession();
+export const createPrivateSSRHelper = cache(async () => {
+ const { user } = await getUserSession();
- if (!session?.user || session.user.isGuest) {
+ if (!user || user.isGuest) {
const pathname = await getPathname();
redirect(
buildSafeRedirectUrl({ destination: "/login", returnUrl: pathname }),
);
}
- const event = createWideEvent({
- service: "trpc",
- });
+ if (user.banned) {
+ throw new InvalidSessionError();
+ }
return createServerSideHelpers({
router: appRouter,
ctx: {
- user: {
- id: session.user.id,
- isGuest: false,
- locale: session.user.locale ?? undefined,
- image: session.user.image ?? undefined,
- timeZone: session.user.timeZone ?? undefined,
- },
- event,
+ user,
+ } satisfies TRPCContext,
+ transformer: superjson,
+ });
+});
+
+/**
+ * Admin Server-Side Helper
+ * @description Use for prefetching data that requires an admin user.
+ * Redirects to /login if not authenticated, to /admin-setup if the user
+ * is the initial admin but not yet promoted, or returns 404 if the user
+ * is not an admin.
+ */
+export const createAdminSSRHelper = cache(async () => {
+ const { user } = await getUserSession();
+
+ if (!user || user.isGuest) {
+ redirect(
+ buildSafeRedirectUrl({
+ destination: "/login",
+ returnUrl: await getPathname(),
+ }),
+ );
+ }
+
+ if (user.banned) {
+ throw new InvalidSessionError();
+ }
+
+ if (user.role !== "admin") {
+ if (isInitialAdmin(user.email)) {
+ redirect("/admin-setup");
+ }
+
+ notFound();
+ }
+
+ const helpers = createServerSideHelpers({
+ router: appRouter,
+ ctx: {
+ user,
} satisfies TRPCContext,
transformer: superjson,
});
-};
+
+ return { helpers, user };
+});
diff --git a/apps/web/src/trpc/trpc.ts b/apps/web/src/trpc/trpc.ts
index 5adac2302..eec4793f5 100644
--- a/apps/web/src/trpc/trpc.ts
+++ b/apps/web/src/trpc/trpc.ts
@@ -1,4 +1,3 @@
-import { prisma } from "@rallly/database";
import { initTRPC, TRPCError } from "@trpc/server";
import { waitUntil } from "@vercel/functions";
import superjson from "superjson";
@@ -70,29 +69,11 @@ export const requireUserMiddleware = middleware(async ({ ctx, next }) => {
});
}
- if (!ctx.user.isGuest) {
- const dbUser = await prisma.user.findUnique({
- where: {
- id: ctx.user.id,
- },
- select: {
- banned: true,
- },
+ if (ctx.user.banned) {
+ throw new TRPCError({
+ code: "FORBIDDEN",
+ message: "Your account has been banned",
});
-
- if (!dbUser) {
- throw new TRPCError({
- code: "UNAUTHORIZED",
- message: "Logged in user does not exist anymore",
- });
- }
-
- if (dbUser.banned) {
- throw new TRPCError({
- code: "FORBIDDEN",
- message: "Your account has been banned",
- });
- }
}
return next({
@@ -119,6 +100,17 @@ export const privateProcedure = procedureWithAnalytics.use(
},
);
+export const adminProcedure = privateProcedure.use(async ({ ctx, next }) => {
+ if (ctx.user.role !== "admin") {
+ throw new TRPCError({
+ code: "FORBIDDEN",
+ message: "Admin access required",
+ });
+ }
+
+ return next();
+});
+
export const spaceProcedure = privateProcedure.use(async ({ ctx, next }) => {
const space = await getActiveSpaceForUser(ctx.user.id);
@@ -167,7 +159,9 @@ export const createRateLimitMiddleware = (
const ratelimit = createRatelimit(requests, duration);
return middleware(async ({ ctx, next }) => {
- ctx.event.rateLimiter = ratelimit?.name ?? "none";
+ if (ctx.event) {
+ ctx.event.rateLimiter = ratelimit?.name ?? "none";
+ }
if (!ratelimit) {
return next();
@@ -184,7 +178,9 @@ export const createRateLimitMiddleware = (
`${name}:${ctx.identifier}`,
);
- ctx.event.rateLimiterRemainingPoints = remainingPoints;
+ if (ctx.event) {
+ ctx.event.rateLimiterRemainingPoints = remainingPoints;
+ }
if (!success) {
throw new TRPCError({
diff --git a/apps/web/tests/admin-setup.spec.ts b/apps/web/tests/admin-setup.spec.ts
index 4296006b0..d1edd8fa0 100644
--- a/apps/web/tests/admin-setup.spec.ts
+++ b/apps/web/tests/admin-setup.spec.ts
@@ -29,7 +29,7 @@ test.describe("Admin Setup Page Access", () => {
test("should redirect unauthenticated user to login page", async ({
page,
}) => {
- await page.goto("/control-panel/setup");
+ await page.goto("/admin-setup");
await expect(page).toHaveURL(/.*\/login/);
});
@@ -44,7 +44,7 @@ test.describe("Admin Setup Page Access", () => {
await loginWithEmail(page, { email: INITIAL_ADMIN_TEST_EMAIL });
await page.goto("/control-panel");
- await expect(page).toHaveURL(/.*\/control-panel\/setup/);
+ await expect(page).toHaveURL(/.*\/admin-setup/);
await expect(page.getByText("Are you the admin?")).toBeVisible();
await expect(
page.getByRole("button", { name: "Make me an admin" }),
@@ -61,7 +61,7 @@ test.describe("Admin Setup Page Access", () => {
});
await loginWithEmail(page, { email: REGULAR_USER_EMAIL });
- await page.goto("/control-panel/setup");
+ await page.goto("/admin-setup");
await expect(page.getByText("Page not found")).toBeVisible();
});
@@ -75,7 +75,7 @@ test.describe("Admin Setup Page Access", () => {
});
await loginWithEmail(page, { email: SUBSEQUENT_ADMIN_EMAIL });
- await page.goto("/control-panel/setup");
+ await page.goto("/admin-setup");
await expect(page).toHaveURL("/control-panel");
});
@@ -89,7 +89,7 @@ test.describe("Admin Setup Page Access", () => {
});
await loginWithEmail(page, { email: OTHER_USER_EMAIL });
- await page.goto("/control-panel/setup");
+ await page.goto("/admin-setup");
await expect(page.getByText("Page not found")).toBeVisible();
});
@@ -103,7 +103,7 @@ test.describe("Admin Setup Page Access", () => {
});
await loginWithEmail(page, { email: INITIAL_ADMIN_TEST_EMAIL });
- await page.goto("/control-panel/setup");
+ await page.goto("/admin-setup");
await expect(page.getByText("Are you the admin?")).toBeVisible();
await page.getByRole("button", { name: "Make me an admin" }).click();