OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.
ralph(M15-007): R10: the 38 require* access checks collapse into the auth service and the procedure builders
ralphb668781a5f34
diff --git a/packages/core/src/http/context.ts b/packages/core/src/http/context.tsindex 38c64c311..4173b7b90 100644--- a/packages/core/src/http/context.ts+++ b/packages/core/src/http/context.ts@@ -52,17 +52,20 @@ export function requestContext(deps: AppDeps) {const cookies = wrapCookies(cookie);let session: Promise<Session | null> | undefined;- return {- ctx: extendCtx(createCtx(deps, { requestId, logger }), {- headers: request.headers,- ip: clientIp,- cookies,- session: () =>- (session ??= resolveSession(deps, cookies, request.headers)),- setCookie: (name: string, value: string, options?: CookieOptions) =>- writeCookie(cookie, name, value, options),- }),- };+ // `resolveSession` reads `ctx.services.auth` (ADR-022 R22), so the+ // resolver closes over the ctx it is installed on. Safe because it is+ // lazy: nothing calls it during the derive.+ const ctx: HttpCtx = extendCtx(createCtx(deps, { requestId, logger }), {+ headers: request.headers,+ ip: clientIp,+ cookies,+ session: () =>+ (session ??= resolveSession(ctx, cookies, request.headers)),+ setCookie: (name: string, value: string, options?: CookieOptions) =>+ writeCookie(cookie, name, value, options),+ });++ return { ctx };});}diff --git a/packages/core/src/http/session.ts b/packages/core/src/http/session.tsindex f86e7041e..9856fdf0b 100644--- a/packages/core/src/http/session.ts+++ b/packages/core/src/http/session.ts@@ -10,15 +10,19 @@// DEMO_USER_ID branch — which lives inside `validateSessionToken` itself, so// the no-cookie path still goes through it rather than short-circuiting here.//+// M15-007: both halves arrive as `ctx.services.auth`, not as a deep import of+// `modules/auth/src/*` (ADR-022 R22). The derive in `http/context.ts` builds+// the `Ctx` before it installs this resolver and the resolver is lazy, so the+// services graph is there by the time a guard asks for a session — a request+// that never asks (every `/track`) still builds none.+//// `null` means "nobody is signed in", NOT `EMPTY_SESSION`: the `session`// macro, the bull-board guard and the four `/live` handlers all treat the// resolved value as truthy-means-authenticated. tRPC is the one caller that// wants V1's empty shape instead, and `makeTrpcContext` maps `null` back to// `EMPTY_SESSION` there.-import type { AppDeps, Session } from '../context';-import { validateSessionToken } from '../modules/auth/src/login-session';-import { decodeSessionToken } from '../modules/auth/src/token';+import type { Ctx, Session } from '../context';import { runWithAlsSession } from '../modules/session/src/session-context';import type { CookieJar } from '../shared/cookie';@@ -28,16 +32,17 @@ export const SESSION_COOKIE_NAME = 'session';const DEMO_ALS_SESSION_ID = '1';export async function resolveSession(- deps: AppDeps,+ ctx: Ctx,cookies: CookieJar,_headers: Headers): Promise<Session | null> {const token = cookies.get(SESSION_COOKIE_NAME);+ const auth = ctx.services.auth;try {const result = await runWithAlsSession(- token ? decodeSessionToken(token) : DEMO_ALS_SESSION_ID,- () => validateSessionToken(deps, token ?? null)+ token ? auth.decodeSessionToken(token) : DEMO_ALS_SESSION_ID,+ () => auth.validateSessionToken(token ?? null));return result.userId === null ? null : result;} catch {diff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex b964bc3fe..748edfd00 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -279,7 +279,6 @@ export type { SessionValidationResult } from './modules/auth/src/login-session';export {createDemoSession,createSession,- EMPTY_SESSION,invalidateSession,validateSessionToken,} from './modules/auth/src/login-session';@@ -1071,4 +1070,7 @@ export {safeFetch,safeFetchStream,} from './shared/safe-fetch';+// Below the transports since M15-007 (ADR-022 R22): `rpc/base.ts` needs the+// empty shape and may not deep-import a module to get it.+export { EMPTY_SESSION } from './shared/session';export { assertSafeUrl, createPinnedLookup } from './shared/ssrf';diff --git a/packages/core/src/modules/assistant/assistant.rpc.ts b/packages/core/src/modules/assistant/assistant.rpc.tsindex c4b429cde..2cd7199a0 100644--- a/packages/core/src/modules/assistant/assistant.rpc.ts+++ b/packages/core/src/modules/assistant/assistant.rpc.ts@@ -8,23 +8,13 @@// (ADR-011).import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import {getAvailableChatModels,PREFERRED_DEFAULT_MODEL_ID,} from './assistant.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const chatRouter = createTRPCRouter({models: protectedProcedure.query(({ ctx }) => {- requireLogin(ctx.session.userId);-const providers = {openai: Boolean(ctx.config.ai.openai.apiKey),anthropic: Boolean(ctx.config.ai.anthropic.apiKey),diff --git a/packages/core/src/modules/auth/auth.rpc.ts b/packages/core/src/modules/auth/auth.rpc.tsindex 04a1a3b1d..74415485e 100644--- a/packages/core/src/modules/auth/auth.rpc.ts+++ b/packages/core/src/modules/auth/auth.rpc.ts@@ -20,7 +20,6 @@ import {protectedProcedure,publicProcedure,} from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import {zProvider,zRequestResetPassword,@@ -48,13 +47,6 @@ import {startOAuthSignIn,} from './auth.service';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const authRouter = createTRPCRouter({signOut: publicProcedure.mutation(async ({ ctx }) => {await signOutUser(ctx, ctx.setCookie, ctx.session?.session?.id);@@ -81,33 +73,29 @@ export const authRouter = createTRPCRouter({),totpStatus: protectedProcedure.query(({ ctx }) =>- getTotpStatus(ctx, requireLogin(ctx.session.userId))+ getTotpStatus(ctx, ctx.session.userId)),totpSetup: protectedProcedure.mutation(({ ctx }) =>- setupTotp(ctx, requireLogin(ctx.session.userId))+ setupTotp(ctx, ctx.session.userId)),totpEnable: protectedProcedure.input(z.object({ code: zTotpCode })).mutation(({ input, ctx }) =>- enableTotp(ctx, requireLogin(ctx.session.userId), input.code)+ enableTotp(ctx, ctx.session.userId, input.code)),totpDisable: protectedProcedure.input(z.object({ code: zTotpOrRecoveryCode })).mutation(({ input, ctx }) =>- disableTotp(ctx, requireLogin(ctx.session.userId), input.code)+ disableTotp(ctx, ctx.session.userId, input.code)),totpRegenerateRecoveryCodes: protectedProcedure.input(z.object({ code: zTotpCode })).mutation(({ input, ctx }) =>- regenerateTotpRecoveryCodes(- ctx,- requireLogin(ctx.session.userId),- input.code- )+ regenerateTotpRecoveryCodes(ctx, ctx.session.userId, input.code)),resetPassword: publicProcedurediff --git a/packages/core/src/modules/auth/auth.service.ts b/packages/core/src/modules/auth/auth.service.tsindex 3d69258e1..1c8a194d0 100644--- a/packages/core/src/modules/auth/auth.service.ts+++ b/packages/core/src/modules/auth/auth.service.ts@@ -139,6 +139,24 @@ export function resetAccessChecksForTests(): void {accessChecksPromise = undefined;}+/**+ * The one login check in the tree (ADR-022 R10).+ *+ * `protectedProcedure` already refuses an anonymous caller and hands the+ * handler a `session.userId` that is a `string`, so a protected procedure+ * needs nothing here. This is for the paths the builder cannot decide: the+ * share-aware `chartProcedure` / `overviewProcedure`, which are public+ * because a valid share link is an alternative to being signed in, and only+ * demand a user when no share was presented. Until M15-007 it was copied,+ * unexported, into 28 `*.rpc.ts` files.+ */+export function requireLogin(userId: string | null | undefined): string {+ if (!userId) {+ throw new TRPCAccessError('Not authenticated');+ }+ return userId;+}+/*** Registered in `services.ts`. Ignores BOTH arguments, and takes them only* because ADR-022 R3 keeps the composition root a flat list: every member@@ -169,6 +187,15 @@ export function createAuthService(return {...accessChecks,+ requireLogin,+ /**+ * The session cookie's other half. `http/session.ts` reaches it here+ * rather than deep-importing `./src/login-session` (ADR-022 R22), which+ * is also what keeps the demo-user branch inside one function.+ */+ validateSessionToken: (+ token: string | null | undefined+ ): Promise<SessionValidationResult> => validateSessionToken(deps, token),async getProjectAccess(args: {userId: string;projectId: string;@@ -246,6 +273,7 @@ import { getUserAccount } from '../user/user.service';import {createSession,invalidateSession,+ type SessionValidationResult,validateSessionToken,} from './src/login-session';import { getIsRegistrationAllowed } from './src/registration';diff --git a/packages/core/src/modules/auth/src/login-session.ts b/packages/core/src/modules/auth/src/login-session.tsindex a3db4b684..a7387e79b 100644--- a/packages/core/src/modules/auth/src/login-session.ts+++ b/packages/core/src/modules/auth/src/login-session.ts@@ -10,6 +10,7 @@import type { Session, User } from '@openpanel/db/src/prisma-client';import type { ServiceDeps } from '../../../services';+import { EMPTY_SESSION } from '../../../shared/session';import { decodeSessionToken, hashSessionToken } from './token';/** Only Postgres — narrowed so `AppDeps` (http/session.ts, before@@ -25,12 +26,6 @@ export type SessionValidationResult =| { session: Session; user: User; userId: string }| { session: null; user: null; userId: null };-export const EMPTY_SESSION: SessionValidationResult = {- session: null,- user: null,- userId: null,-};-export async function createSession(deps: LoginSessionDeps,token: string,diff --git a/packages/core/src/modules/chart/chart.rpc.ts b/packages/core/src/modules/chart/chart.rpc.tsindex a3563f033..b9468097f 100644--- a/packages/core/src/modules/chart/chart.rpc.ts+++ b/packages/core/src/modules/chart/chart.rpc.ts@@ -36,21 +36,6 @@ const zShareable = z.object({const zShareableReportInput = zReportInput.and(zShareable);-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireReadAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}-/*** Share-aware access: with `shareId`, the share must be valid for the report* and the saved report is returned; without it, the caller must be a member.@@ -60,7 +45,11 @@ async function resolveShare(input: { projectId: string; shareId?: string; id?: string }): Promise<NonNullable<IServiceReport> | null> {if (!input.shareId) {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.services.auth.requireLogin(ctx.session.userId),+ projectId: input.projectId,+ level: 'read',+ });return null;}if (!input.id) {@@ -106,21 +95,33 @@ export const chartRouter = createTRPCRouter({projectCard: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return ctx.services.chart.getProjectCard(input.projectId);}),events: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return ctx.services.chart.listChartEvents(input.projectId);}),properties: protectedProcedure.input(z.object({ event: z.string().optional(), projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return ctx.services.chart.listChartProperties(input);}),@@ -133,7 +134,11 @@ export const chartRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return ctx.services.chart.getChartPropertyValues(input);}),@@ -156,7 +161,11 @@ export const chartRouter = createTRPCRouter({sankey: protectedProcedure.input(zReportInput).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return ctx.services.chart.getSankeyChart(input);}),@@ -207,7 +216,11 @@ export const chartRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return ctx.services.chart.bucketProfiles(input);}),@@ -234,7 +247,11 @@ export const chartRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return ctx.services.chart.funnelStepProfiles(input);}),});diff --git a/packages/core/src/modules/client/client.rpc.ts b/packages/core/src/modules/client/client.rpc.tsindex af7206ec9..823ac1263 100644--- a/packages/core/src/modules/client/client.rpc.ts+++ b/packages/core/src/modules/client/client.rpc.ts@@ -14,14 +14,7 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError, TRPCForbiddenError } from '../../rpc/errors';--function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}+import { TRPCForbiddenError } from '../../rpc/errors';export const clientRouter = createTRPCRouter({list: protectedProcedure@@ -35,7 +28,7 @@ export const clientRouter = createTRPCRouter({update: protectedProcedure.input(z.object({ id: z.string(), name: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const access = await ctx.services.auth.getClientAccess({userId,clientId: input.id,@@ -66,7 +59,7 @@ export const clientRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;// Minting an ingestion credential - a `root` one at the caller's// choosing - is admin-tier, not something any org member should be// able to do.@@ -97,7 +90,7 @@ export const clientRouter = createTRPCRouter({remove: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const client = await ctx.services.client.getClientById(input.id);if (!client?.organizationId) {diff --git a/packages/core/src/modules/cohort/cohort.rpc.ts b/packages/core/src/modules/cohort/cohort.rpc.tsindex c65d97aee..92c4c80a3 100644--- a/packages/core/src/modules/cohort/cohort.rpc.ts+++ b/packages/core/src/modules/cohort/cohort.rpc.ts@@ -16,7 +16,7 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError, TRPCNotFoundError } from '../../rpc/errors';+import { TRPCNotFoundError } from '../../rpc/errors';// The canonical zChartEventFilter, not cohort.constants.ts's private// TDZ-workaround copy — matches V1's router, which imports it from// packages/validation's barrel rather than from cohort.validation.ts.@@ -41,13 +41,6 @@ import {const EXPORT_PROFILES_MAX_LIMIT = 10_000;const EXPORT_PROFILES_DEFAULT_LIMIT = 10_000;-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const cohortRouter = createTRPCRouter({list: protectedProcedure.input(@@ -57,7 +50,7 @@ export const cohortRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -83,7 +76,7 @@ export const cohortRouter = createTRPCRouter({get: protectedProcedure.input(z.object({ id: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const cohort = await db.cohort.findUnique({where: { id: input.id },@@ -109,8 +102,6 @@ export const cohortRouter = createTRPCRouter({create: protectedProcedure.input(zCohortInput).mutation(async ({ input, ctx }) => {- requireLogin(ctx.session.userId);-const db = ctx.db;const cohort = await db.cohort.create({data: {@@ -130,7 +121,7 @@ export const cohortRouter = createTRPCRouter({update: protectedProcedure.input(zCohortUpdate).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const { id, ...data } = input;const db = ctx.db;@@ -168,7 +159,7 @@ export const cohortRouter = createTRPCRouter({delete: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const cohort = await db.cohort.findUnique({where: { id: input.id },@@ -205,7 +196,7 @@ export const cohortRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -222,7 +213,7 @@ export const cohortRouter = createTRPCRouter({mostEvents: protectedProcedure.input(z.object({ projectId: z.string(), cohortId: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -235,7 +226,7 @@ export const cohortRouter = createTRPCRouter({eventsPerDay: protectedProcedure.input(z.object({ projectId: z.string(), cohortId: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -248,7 +239,7 @@ export const cohortRouter = createTRPCRouter({popularRoutes: protectedProcedure.input(z.object({ projectId: z.string(), cohortId: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -261,7 +252,7 @@ export const cohortRouter = createTRPCRouter({getCount: protectedProcedure.input(z.object({ cohortId: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const cohort = await db.cohort.findUnique({where: { id: input.cohortId },@@ -289,7 +280,7 @@ export const cohortRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -320,7 +311,7 @@ export const cohortRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const cohort = await db.cohort.findUnique({where: { id: input.cohortId },@@ -356,7 +347,7 @@ export const cohortRouter = createTRPCRouter({refresh: protectedProcedure.input(z.object({ cohortId: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const cohort = await db.cohort.findUnique({where: { id: input.cohortId },diff --git a/packages/core/src/modules/conversation/conversation.rpc.ts b/packages/core/src/modules/conversation/conversation.rpc.tsindex 2dc9997b5..5cd884390 100644--- a/packages/core/src/modules/conversation/conversation.rpc.ts+++ b/packages/core/src/modules/conversation/conversation.rpc.ts@@ -14,7 +14,7 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError, TRPCNotFoundError } from '../../rpc/errors';+import { TRPCNotFoundError } from '../../rpc/errors';import { getOrganizationByProjectIdCached } from '../organization/organization.service';const LIST_LIMIT_MIN = 1;@@ -23,13 +23,6 @@ const LIST_LIMIT_DEFAULT = 50;const TITLE_MIN_LENGTH = 1;const TITLE_MAX_LENGTH = 80;-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-/*** Conversation management — listing, fetching, renaming, deleting.* Conversation creation is implicit (lazy) on the first message via the@@ -51,7 +44,7 @@ export const conversationRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -68,7 +61,7 @@ export const conversationRouter = createTRPCRouter({get: protectedProcedure.input(z.object({ id: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const conv = await ctx.services.conversation.getConversationById(input.id,{ withMessages: true }@@ -98,7 +91,7 @@ export const conversationRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;// If the conversation already exists, enforce ownership. If it// doesn't, verify the caller has access to the project being@@ -142,7 +135,7 @@ export const conversationRouter = createTRPCRouter({delete: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const conv = await ctx.services.conversation.getConversationById(input.id);diff --git a/packages/core/src/modules/dashboard/dashboard.rpc.ts b/packages/core/src/modules/dashboard/dashboard.rpc.tsindex 9e9d3c6c3..62568eac4 100644--- a/packages/core/src/modules/dashboard/dashboard.rpc.ts+++ b/packages/core/src/modules/dashboard/dashboard.rpc.ts@@ -12,35 +12,8 @@// the only check that fires.import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError, TRPCNotFoundError } from '../../rpc/errors';--function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireReadAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}--async function requireWriteAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'write',- });-}+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';+import { TRPCNotFoundError } from '../../rpc/errors';export const dashboardRouter = createTRPCRouter({list: protectedProcedure@@ -50,7 +23,6 @@ export const dashboardRouter = createTRPCRouter({})).query(({ input, ctx }) => {- requireLogin(ctx.session.userId);return ctx.services.dashboard.getDashboardsByProjectId(input.projectId);}),@@ -62,7 +34,11 @@ export const dashboardRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const dashboard = await ctx.services.dashboard.getDashboardById(input.id,@@ -84,7 +60,11 @@ export const dashboardRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- await requireWriteAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'write',+ });return ctx.services.dashboard.createDashboard(input);}),@@ -99,7 +79,11 @@ export const dashboardRouter = createTRPCRouter({const dashboard = await ctx.services.dashboard.getDashboardByIdOrThrow(input.id);- await requireWriteAccess(ctx, dashboard.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dashboard.projectId,+ level: 'write',+ });return ctx.services.dashboard.updateDashboard(input);}),@@ -114,7 +98,11 @@ export const dashboardRouter = createTRPCRouter({const dashboard = await ctx.services.dashboard.getDashboardByIdOrThrow(input.id);- await requireWriteAccess(ctx, dashboard.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dashboard.projectId,+ level: 'write',+ });return ctx.services.dashboard.deleteDashboard(input);}),});diff --git a/packages/core/src/modules/email/email.rpc.ts b/packages/core/src/modules/email/email.rpc.tsindex cb245f3cf..819729da1 100644--- a/packages/core/src/modules/email/email.rpc.ts+++ b/packages/core/src/modules/email/email.rpc.ts@@ -31,16 +31,9 @@ import {protectedProcedure,publicProcedure,} from '../../rpc/base';-import { TRPCAccessError, TRPCBadRequestError } from '../../rpc/errors';+import { TRPCBadRequestError } from '../../rpc/errors';import { emailCategories } from './email.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const emailRouter = createTRPCRouter({unsubscribe: publicProcedure.input(@@ -68,7 +61,6 @@ export const emailRouter = createTRPCRouter({}),getPreferences: protectedProcedure.query(async ({ ctx }) => {- requireLogin(ctx.session.userId);if (!ctx.session.user?.email) {throw new Error('User not authenticated');}@@ -91,7 +83,6 @@ export const emailRouter = createTRPCRouter({updatePreferences: protectedProcedure.input(z.object({ categories: z.record(z.string(), z.boolean()) })).mutation(async ({ input, ctx }) => {- requireLogin(ctx.session.userId);const email = ctx.session.user?.email;if (!email) {throw new Error('User not authenticated');diff --git a/packages/core/src/modules/event/event.rpc.ts b/packages/core/src/modules/event/event.rpc.tsindex 032fa3244..df9b664f3 100644--- a/packages/core/src/modules/event/event.rpc.ts+++ b/packages/core/src/modules/event/event.rpc.ts@@ -16,12 +16,8 @@// for it is gone.import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError, TRPCNotFoundError } from '../../rpc/errors';+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';+import { TRPCNotFoundError } from '../../rpc/errors';import { getChartStartEndDate } from '../../shared/date';import { getSettingsForProject } from '../organization/organization.service';import {@@ -54,25 +50,6 @@ const zChartWindow = z.object({interval: zTimeInterval,});-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireAccess(- ctx: TrpcContext,- projectId: string,- level: 'read' | 'write'-) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level,- });-}-function formatClickhouseDateTime(date: Date): string {return date.toISOString().slice(0, 19).replace('T', ' ');}@@ -89,13 +66,21 @@ export const eventRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'write');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'write',+ });return updateEventMeta(ctx, input);}),byId: protectedProcedure.input(zEventRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const event = await getEventById(ctx, input);if (!event) {@@ -105,7 +90,11 @@ export const eventRouter = createTRPCRouter({}),details: protectedProcedure.input(zEventRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const details = await getEventDetails(ctx, input);if (!details) {@@ -131,7 +120,11 @@ export const eventRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getEventListPage(ctx, input);}),@@ -139,7 +132,11 @@ export const eventRouter = createTRPCRouter({conversionNames: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getConversionEventNames(ctx, input.projectId);}),@@ -156,7 +153,11 @@ export const eventRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getConversionListPage(ctx, input);}),@@ -170,7 +171,11 @@ export const eventRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getBotEventsPage(ctx, input);}),@@ -184,7 +189,11 @@ export const eventRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { timezone } = await getSettingsForProject(ctx, input.projectId);const { startDate, endDate } = getChartStartEndDate(input, timezone);@@ -201,7 +210,11 @@ export const eventRouter = createTRPCRouter({pagesTimeseries: protectedProcedure.input(zChartWindow).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { timezone } = await getSettingsForProject(ctx, input.projectId);const { startDate, endDate } = getChartStartEndDate(input, timezone);@@ -217,7 +230,11 @@ export const eventRouter = createTRPCRouter({previousPages: protectedProcedure.input(zChartWindow).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { timezone } = await getSettingsForProject(ctx, input.projectId);const { startDate, endDate } = getChartStartEndDate(input, timezone);@@ -239,7 +256,11 @@ export const eventRouter = createTRPCRouter({pageTimeseries: protectedProcedure.input(zChartWindow.extend({ origin: z.string(), path: z.string() })).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { timezone } = await getSettingsForProject(ctx, input.projectId);const { startDate, endDate } = getChartStartEndDate(input, timezone);@@ -257,7 +278,11 @@ export const eventRouter = createTRPCRouter({origin: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getTopOrigins(ctx, input.projectId);}),diff --git a/packages/core/src/modules/group/group.rpc.ts b/packages/core/src/modules/group/group.rpc.tsindex 7e4226494..6d992a231 100644--- a/packages/core/src/modules/group/group.rpc.ts+++ b/packages/core/src/modules/group/group.rpc.ts@@ -8,12 +8,7 @@// (ADR-011).import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';import { zCreateGroup, zUpdateGroup } from './group.constants';import {createGroup,@@ -36,25 +31,6 @@ const DEFAULT_LIST_TAKE = 50;const zGroupRef = z.object({ id: z.string(), projectId: z.string() });-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireAccess(- ctx: TrpcContext,- projectId: string,- level: 'read' | 'write'-) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level,- });-}-export const groupRouter = createTRPCRouter({list: protectedProcedure.input(@@ -67,13 +43,21 @@ export const groupRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupListPage(ctx, input);}),byId: protectedProcedure.input(zGroupRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupById(ctx, input.id, input.projectId);}),@@ -81,7 +65,11 @@ export const groupRouter = createTRPCRouter({create: protectedProcedure.input(zCreateGroup).mutation(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'write');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'write',+ });return createGroup(ctx, input);}),@@ -89,7 +77,11 @@ export const groupRouter = createTRPCRouter({update: protectedProcedure.input(zUpdateGroup).mutation(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'write');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'write',+ });const { id, projectId, ...data } = input;return updateGroup(ctx, id, projectId, data);@@ -98,7 +90,11 @@ export const groupRouter = createTRPCRouter({delete: protectedProcedure.input(zGroupRef).mutation(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'write');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'write',+ });return deleteGroup(ctx, input.id, input.projectId);}),@@ -106,13 +102,21 @@ export const groupRouter = createTRPCRouter({types: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupTypes(ctx, input.projectId);}),metrics: protectedProcedure.input(zGroupRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupMetrics(ctx, input.id, input.projectId);}),@@ -120,7 +124,11 @@ export const groupRouter = createTRPCRouter({activity: protectedProcedure.input(zGroupRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupActivity(ctx, input.id, input.projectId);}),@@ -128,7 +136,11 @@ export const groupRouter = createTRPCRouter({memberGrowth: protectedProcedure.input(zGroupRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupMemberGrowth(ctx, input.id, input.projectId);}),@@ -144,7 +156,11 @@ export const groupRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupMemberProfilesPage(ctx, input);}),@@ -152,7 +168,11 @@ export const groupRouter = createTRPCRouter({mostEvents: protectedProcedure.input(zGroupRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupMostEvents(ctx, input.id, input.projectId);}),@@ -160,7 +180,11 @@ export const groupRouter = createTRPCRouter({popularRoutes: protectedProcedure.input(zGroupRef).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupPopularRoutes(ctx, input.id, input.projectId);}),@@ -168,7 +192,11 @@ export const groupRouter = createTRPCRouter({properties: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupPropertyKeys(ctx, input.projectId);}),@@ -176,7 +204,11 @@ export const groupRouter = createTRPCRouter({listByIds: protectedProcedure.input(z.object({ projectId: z.string(), ids: z.array(z.string()) })).query(async ({ input, ctx }) => {- await requireAccess(ctx, input.projectId, 'read');+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getGroupsByIds(ctx, input.projectId, input.ids);}),diff --git a/packages/core/src/modules/gsc/gsc.rpc.ts b/packages/core/src/modules/gsc/gsc.rpc.tsindex 671f74c85..7859cc521 100644--- a/packages/core/src/modules/gsc/gsc.rpc.ts+++ b/packages/core/src/modules/gsc/gsc.rpc.ts@@ -11,12 +11,7 @@// (M10-002); every procedure here reaches it through `ctx.services.auth`.import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';import { Arctic, googleGscClient } from '../auth/auth.service';import { zRange, zTimeInterval } from '../report/report.constants';@@ -40,41 +35,26 @@ function toOverviewInterval(: 'day';}-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireRead(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}--async function requireWrite(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'write',- });-}-export const gscRouter = createTRPCRouter({getConnection: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input: { projectId }, ctx }) => {- await requireRead(ctx, projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId,+ level: 'read',+ });return ctx.services.gsc.getConnection(projectId);}),initiateOAuth: protectedProcedure.input(z.object({ projectId: z.string() })).mutation(async ({ input: { projectId }, ctx }) => {- await requireWrite(ctx, projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId,+ level: 'write',+ });const state = Arctic.generateState();const codeVerifier = Arctic.generateCodeVerifier();@@ -97,14 +77,22 @@ export const gscRouter = createTRPCRouter({getSites: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input: { projectId }, ctx }) => {- await requireRead(ctx, projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId,+ level: 'read',+ });return ctx.services.gsc.listSites(projectId);}),selectSite: protectedProcedure.input(z.object({ projectId: z.string(), siteUrl: z.string() })).mutation(async ({ input: { projectId, siteUrl }, ctx }) => {- await requireWrite(ctx, projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId,+ level: 'write',+ });await ctx.services.gsc.selectSite(projectId, siteUrl);return { ok: true };@@ -113,7 +101,11 @@ export const gscRouter = createTRPCRouter({disconnect: protectedProcedure.input(z.object({ projectId: z.string() })).mutation(async ({ input: { projectId }, ctx }) => {- await requireWrite(ctx, projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId,+ level: 'write',+ });await ctx.services.gsc.disconnect(projectId);return { ok: true };@@ -122,7 +114,11 @@ export const gscRouter = createTRPCRouter({getOverview: protectedProcedure.input(zGscDateInput).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -142,7 +138,11 @@ export const gscRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -158,7 +158,11 @@ export const gscRouter = createTRPCRouter({getPageDetails: protectedProcedure.input(zGscDateInput.extend({ page: z.string() })).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -174,7 +178,11 @@ export const gscRouter = createTRPCRouter({getQueryDetails: protectedProcedure.input(zGscDateInput.extend({ query: z.string() })).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -194,7 +202,11 @@ export const gscRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -210,7 +222,11 @@ export const gscRouter = createTRPCRouter({getSearchEngines: protectedProcedure.input(zGscDateInput).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -225,7 +241,11 @@ export const gscRouter = createTRPCRouter({getAiEngines: protectedProcedure.input(zGscDateInput).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -236,7 +256,11 @@ export const gscRouter = createTRPCRouter({getPreviousOverview: protectedProcedure.input(zGscDateInput).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,input@@ -252,7 +276,11 @@ export const gscRouter = createTRPCRouter({getCannibalization: protectedProcedure.input(zGscDateInput).query(async ({ input, ctx }) => {- await requireRead(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { startDate, endDate } = await ctx.services.gsc.resolveDateRange(input.projectId,inputdiff --git a/packages/core/src/modules/import/import.rpc.ts b/packages/core/src/modules/import/import.rpc.tsindex a37532a07..60728df08 100644--- a/packages/core/src/modules/import/import.rpc.ts+++ b/packages/core/src/modules/import/import.rpc.ts@@ -17,25 +17,14 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import {- TRPCAccessError,- TRPCBadRequestError,- TRPCNotFoundError,-} from '../../rpc/errors';+import { TRPCBadRequestError, TRPCNotFoundError } from '../../rpc/errors';import { zCreateImport } from './import.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const importRouter = createTRPCRouter({list: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -52,7 +41,7 @@ export const importRouter = createTRPCRouter({get: protectedProcedure.input(z.object({ id: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const importRecord = await db.import.findUniqueOrThrow({where: { id: input.id },@@ -71,7 +60,7 @@ export const importRouter = createTRPCRouter({create: protectedProcedure.input(zCreateImport).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -116,7 +105,7 @@ export const importRouter = createTRPCRouter({delete: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const importRecord = await db.import.findUniqueOrThrow({where: { id: input.id },@@ -138,7 +127,7 @@ export const importRouter = createTRPCRouter({retry: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const importRecord = await db.import.findUniqueOrThrow({where: { id: input.id },diff --git a/packages/core/src/modules/insight/insight.rpc.ts b/packages/core/src/modules/insight/insight.rpc.tsindex 2ee85b7aa..01c649410 100644--- a/packages/core/src/modules/insight/insight.rpc.ts+++ b/packages/core/src/modules/insight/insight.rpc.ts@@ -12,7 +12,6 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import type { InsightPayload } from './insight.constants';const DAY_MS = 24 * 60 * 60 * 1000;@@ -23,13 +22,6 @@ const EXPLAIN_COLUMNS = ['utm_source',] as const;-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const insightRouter = createTRPCRouter({list: protectedProcedure.input(@@ -39,7 +31,7 @@ export const insightRouter = createTRPCRouter({})).query(async ({ input: { projectId, limit }, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId,@@ -95,7 +87,7 @@ export const insightRouter = createTRPCRouter({})).query(async ({ input: { projectId, limit }, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId,@@ -112,7 +104,7 @@ export const insightRouter = createTRPCRouter({explain: protectedProcedure.input(z.object({ insightId: z.string() })).mutation(async ({ input: { insightId }, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const db = ctx.db;const { getSegmentDailySeriesCore, getTrafficBreakdownCore } =diff --git a/packages/core/src/modules/integration/integration.rpc.ts b/packages/core/src/modules/integration/integration.rpc.tsindex eeb67d237..1a94a9f8c 100644--- a/packages/core/src/modules/integration/integration.rpc.ts+++ b/packages/core/src/modules/integration/integration.rpc.ts@@ -13,7 +13,6 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import {zCreateGCSExportIntegration,zCreateS3ExportIntegration,@@ -30,38 +29,23 @@ import {upsertIntegration,} from './integration.service';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const integrationRouter = createTRPCRouter({get: protectedProcedure.input(z.object({ id: z.string() })).query(({ input, ctx }) =>- getIntegrationById(ctx, requireLogin(ctx.session.userId), input.id)+ getIntegrationById(ctx, ctx.session.userId, input.id)),list: protectedProcedure.input(z.object({ projectId: z.string() })).query(({ input, ctx }) =>- listIntegrationsForProject(- ctx,- requireLogin(ctx.session.userId),- input.projectId- )+ listIntegrationsForProject(ctx, ctx.session.userId, input.projectId)),createOrUpdateSlack: protectedProcedure.input(zCreateSlackIntegration).mutation(({ input, ctx }) =>- createOrUpdateSlackIntegration(- ctx,- requireLogin(ctx.session.userId),- input- )+ createOrUpdateSlackIntegration(ctx, ctx.session.userId, input)),// Generic create/update for any form-configured integration. Per-type@@ -76,7 +60,7 @@ export const integrationRouter = createTRPCRouter({})).mutation(({ input, ctx }) =>- upsertIntegration(ctx, requireLogin(ctx.session.userId), input)+ upsertIntegration(ctx, ctx.session.userId, input)),// Back-compat alias for the export forms; delegates to the same generic path.@@ -84,7 +68,7 @@ export const integrationRouter = createTRPCRouter({createOrUpdateExport: protectedProcedure.input(z.union([zCreateS3ExportIntegration, zCreateGCSExportIntegration])).mutation(({ input, ctx }) =>- upsertIntegration(ctx, requireLogin(ctx.session.userId), input)+ upsertIntegration(ctx, ctx.session.userId, input)),testConnection: protectedProcedure@@ -95,7 +79,7 @@ export const integrationRouter = createTRPCRouter({})).mutation(({ input, ctx }) =>- testIntegrationConnection(ctx, requireLogin(ctx.session.userId), input)+ testIntegrationConnection(ctx, ctx.session.userId, input)),// Back-compat alias for the export forms; same gate as `testConnection`.@@ -103,16 +87,12 @@ export const integrationRouter = createTRPCRouter({testExportConnection: protectedProcedure.input(z.union([zCreateS3ExportIntegration, zCreateGCSExportIntegration])).mutation(({ input, ctx }) =>- testExportIntegrationConnection(- ctx,- requireLogin(ctx.session.userId),- input- )+ testExportIntegrationConnection(ctx, ctx.session.userId, input)),delete: protectedProcedure.input(z.object({ id: z.string() })).mutation(({ input: { id }, ctx }) =>- deleteIntegration(ctx, requireLogin(ctx.session.userId), id)+ deleteIntegration(ctx, ctx.session.userId, id)),});diff --git a/packages/core/src/modules/notification/notification.rpc.ts b/packages/core/src/modules/notification/notification.rpc.tsindex 95641d445..92c824b66 100644--- a/packages/core/src/modules/notification/notification.rpc.ts+++ b/packages/core/src/modules/notification/notification.rpc.ts@@ -17,7 +17,6 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import { zCreateNotificationRule } from './notification.constants';import {createOrUpdateNotificationRule,@@ -28,32 +27,23 @@ import {listNotifications,} from './notification.service';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const notificationRouter = createTRPCRouter({list: protectedProcedure.input(z.object({ projectId: z.string() })).query(({ input, ctx }) => {- requireLogin(ctx.session.userId);return listNotifications(ctx, input.projectId);}),rules: protectedProcedure.input(z.object({ projectId: z.string() })).query(({ input, ctx }) => {- requireLogin(ctx.session.userId);return listNotificationRules(ctx, input.projectId);}),createOrUpdateRule: protectedProcedure.input(zCreateNotificationRule).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;// Clear the cache for the projectawait getNotificationRulesByProjectId.clear(ctx, input.projectId);@@ -79,7 +69,7 @@ export const notificationRouter = createTRPCRouter({deleteRule: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const rule = await getNotificationRuleByIdOrThrow(ctx, input.id);await ctx.services.auth.requireProjectAccess({diff --git a/packages/core/src/modules/onboarding/onboarding.rpc.ts b/packages/core/src/modules/onboarding/onboarding.rpc.tsindex d09d8e0de..3f5fcf1b3 100644--- a/packages/core/src/modules/onboarding/onboarding.rpc.ts+++ b/packages/core/src/modules/onboarding/onboarding.rpc.ts@@ -17,7 +17,7 @@ import {protectedProcedure,publicProcedure,} from '../../rpc/base';-import { TRPCAccessError, TRPCForbiddenError } from '../../rpc/errors';+import { TRPCForbiddenError } from '../../rpc/errors';import { zOnboardingProject } from './onboarding.constants';import {canSkipOnboarding,@@ -28,13 +28,6 @@ function loadOrganizationAccess() {return import('../../shared/access-lookups');}-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const onboardingRouter = createTRPCRouter({skipOnboardingCheck: publicProcedure.query(({ ctx }) =>canSkipOnboarding(ctx, ctx.session.userId)@@ -43,7 +36,7 @@ export const onboardingRouter = createTRPCRouter({project: protectedProcedure.input(zOnboardingProject).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;if (input.organizationId) {const { getOrganizationAccess } = await loadOrganizationAccess();diff --git a/packages/core/src/modules/organization/organization.rpc.ts b/packages/core/src/modules/organization/organization.rpc.tsindex 27ae711d8..5d2db2d27 100644--- a/packages/core/src/modules/organization/organization.rpc.ts+++ b/packages/core/src/modules/organization/organization.rpc.ts@@ -20,43 +20,23 @@ import {protectedProcedure,protectedProcedureWithoutAccess,publicProcedure,- type TrpcContext,} from '../../rpc/base';-import {- TRPCAccessError,- TRPCBadRequestError,- TRPCForbiddenError,-} from '../../rpc/errors';+import { TRPCBadRequestError, TRPCForbiddenError } from '../../rpc/errors';import {zEditOrganization,zInviteUser,zUpdateMemberAccess,} from './organization.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireOrgAdmin(ctx: TrpcContext, organizationId: string) {- await ctx.services.auth.requireOrganizationAdmin({- userId: requireLogin(ctx.session.userId),- organizationId,- });-}-export const organizationRouter = createTRPCRouter({get: protectedProcedure.input(z.object({ organizationId: z.string() })).query(async ({ input, ctx }) => {- requireLogin(ctx.session.userId);return ctx.services.organization.get(input.organizationId);}),list: protectedProcedure.query(async ({ ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;return ctx.services.organization.list(userId);}),@@ -66,7 +46,7 @@ export const organizationRouter = createTRPCRouter({myAccess: protectedProcedureWithoutAccess.input(z.object({ organizationId: z.string() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const access = await ctx.services.auth.getOrganizationAccess({userId,organizationId: input.organizationId,@@ -80,14 +60,20 @@ export const organizationRouter = createTRPCRouter({update: protectedProcedure.input(zEditOrganization).mutation(async ({ input, ctx }) => {- await requireOrgAdmin(ctx, input.id);+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.id,+ });return ctx.services.organization.update(input);}),delete: protectedProcedure.input(z.object({ organizationId: z.string() })).mutation(async ({ input, ctx }) => {- await requireOrgAdmin(ctx, input.organizationId);+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.organizationId,+ });await ctx.services.organization.scheduleDeletion(input.organizationId);return true;}),@@ -95,7 +81,10 @@ export const organizationRouter = createTRPCRouter({cancelDeletion: protectedProcedure.input(z.object({ organizationId: z.string() })).mutation(async ({ input, ctx }) => {- await requireOrgAdmin(ctx, input.organizationId);+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.organizationId,+ });await ctx.services.organization.cancelDeletion(input.organizationId);return true;}),@@ -103,8 +92,11 @@ export const organizationRouter = createTRPCRouter({inviteUser: protectedProcedure.input(zInviteUser).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);- await requireOrgAdmin(ctx, input.organizationId);+ const userId = ctx.session.userId;+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.organizationId,+ });return ctx.services.organization.inviteUser({organizationId: input.organizationId,email: input.email,@@ -117,11 +109,13 @@ export const organizationRouter = createTRPCRouter({revokeInvite: protectedProcedure.input(z.object({ inviteId: z.string() })).mutation(async ({ input, ctx }) => {- requireLogin(ctx.session.userId);const invite = await ctx.services.organization.getInviteOrThrow(input.inviteId);- await requireOrgAdmin(ctx, invite.organizationId);+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: invite.organizationId,+ });return ctx.services.organization.revokeInvite(input.inviteId);}),@@ -134,8 +128,11 @@ export const organizationRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- const requestedByUserId = requireLogin(ctx.session.userId);- await requireOrgAdmin(ctx, input.organizationId);+ const requestedByUserId = ctx.session.userId;+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.organizationId,+ });await ctx.services.organization.removeMember({organizationId: input.organizationId,memberId: input.id,@@ -147,11 +144,14 @@ export const organizationRouter = createTRPCRouter({updateMemberAccess: protectedProcedure.input(zUpdateMemberAccess).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;if (input.userId === userId) {throw new TRPCForbiddenError('You cannot update your own access');}- await requireOrgAdmin(ctx, input.organizationId);+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.organizationId,+ });return ctx.services.organization.updateMemberAccess({organizationId: input.organizationId,targetUserId: input.userId,@@ -162,14 +162,20 @@ export const organizationRouter = createTRPCRouter({members: protectedProcedure.input(z.object({ organizationId: z.string() })).query(async ({ input, ctx }) => {- await requireOrgAdmin(ctx, input.organizationId);+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.organizationId,+ });return ctx.services.organization.members(input.organizationId);}),invitations: protectedProcedure.input(z.object({ organizationId: z.string() })).query(async ({ input, ctx }) => {- await requireOrgAdmin(ctx, input.organizationId);+ await ctx.services.auth.requireOrganizationAdmin({+ userId: ctx.session.userId,+ organizationId: input.organizationId,+ });return ctx.services.organization.invitations(input.organizationId);}),diff --git a/packages/core/src/modules/overview/overview.rpc.ts b/packages/core/src/modules/overview/overview.rpc.tsindex 936e87543..a29d05f81 100644--- a/packages/core/src/modules/overview/overview.rpc.ts+++ b/packages/core/src/modules/overview/overview.rpc.ts@@ -20,7 +20,7 @@ import {publicProcedure,type TrpcContext,} from '../../rpc/base';-import { TRPCAccessError, TRPCForbiddenError } from '../../rpc/errors';+import { TRPCForbiddenError } from '../../rpc/errors';import type { ServiceDeps } from '../../services';import {getChartPrevStartEndDate,@@ -45,21 +45,6 @@ import {zGetUserJourneyInput,} from './overview.service';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireReadAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}-/*** Share-aware access: with `shareId`, a public (optionally password-unlocked)* overview share is enough; without it, the caller must be a project member.@@ -88,7 +73,11 @@ async function resolveOverviewAccess(}return;}- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.services.auth.requireLogin(ctx.session.userId),+ projectId: input.projectId,+ level: 'read',+ });}const overviewProcedure = publicProcedure.use(@@ -421,7 +410,11 @@ export const overviewRouter = createTRPCRouter({})).mutation(async ({ ctx, input }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });const { timezone } = await getSettingsForProject(ctx, input.projectId);return ctx.services.assistant.runFilterCommand({query: input.query,diff --git a/packages/core/src/modules/profile/profile.rpc.ts b/packages/core/src/modules/profile/profile.rpc.tsindex 63b579ced..733a0679b 100644--- a/packages/core/src/modules/profile/profile.rpc.ts+++ b/packages/core/src/modules/profile/profile.rpc.ts@@ -8,12 +8,7 @@// (ADR-011).import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';import { zChartEventFilter } from '../report/report.constants';import {getPowerUsers,@@ -31,24 +26,13 @@ const DEFAULT_LIST_TAKE = 50;const zProfileRef = z.object({ profileId: z.string(), projectId: z.string() });-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireReadAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}-export const profileRouter = createTRPCRouter({byId: protectedProcedure.input(zProfileRef).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfileById(ctx, input.profileId, input.projectId);}),@@ -56,7 +40,11 @@ export const profileRouter = createTRPCRouter({metrics: protectedProcedure.input(zProfileRef).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfileMetrics(ctx, input.profileId, input.projectId);}),@@ -64,7 +52,11 @@ export const profileRouter = createTRPCRouter({activity: protectedProcedure.input(zProfileRef).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfileActivity(ctx, input.profileId, input.projectId);}),@@ -72,7 +64,11 @@ export const profileRouter = createTRPCRouter({mostEvents: protectedProcedure.input(zProfileRef).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfileMostEvents(ctx, input.profileId, input.projectId);}),@@ -80,7 +76,11 @@ export const profileRouter = createTRPCRouter({popularRoutes: protectedProcedure.input(zProfileRef).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfilePopularRoutes(ctx, input.profileId, input.projectId);}),@@ -88,7 +88,11 @@ export const profileRouter = createTRPCRouter({properties: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfilePropertyNames(ctx, input.projectId);}),@@ -105,7 +109,11 @@ export const profileRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfileListPage(ctx, input);}),@@ -119,7 +127,11 @@ export const profileRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getPowerUsers(ctx, input);}),@@ -127,7 +139,11 @@ export const profileRouter = createTRPCRouter({values: protectedProcedure.input(z.object({ property: z.string(), projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getProfileValues(ctx, input);}),diff --git a/packages/core/src/modules/project/project.rpc.ts b/packages/core/src/modules/project/project.rpc.tsindex 40dca3348..139ac2835 100644--- a/packages/core/src/modules/project/project.rpc.ts+++ b/packages/core/src/modules/project/project.rpc.ts@@ -14,22 +14,15 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError, TRPCForbiddenError } from '../../rpc/errors';+import { TRPCForbiddenError } from '../../rpc/errors';import { zOnboardingProject } from '../onboarding/onboarding.constants';import { zProjectUpdate } from './project.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const projectRouter = createTRPCRouter({getProjectWithClients: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input: { projectId }, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const access = await ctx.services.auth.getProjectAccess({userId,projectId,@@ -45,7 +38,7 @@ export const projectRouter = createTRPCRouter({activationStatus: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input: { projectId }, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const access = await ctx.services.auth.getProjectAccess({userId,projectId,@@ -60,7 +53,7 @@ export const projectRouter = createTRPCRouter({list: protectedProcedure.input(z.object({ organizationId: z.string().nullable() })).query(async ({ input: { organizationId }, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;if (organizationId === null) {return [];}@@ -70,7 +63,7 @@ export const projectRouter = createTRPCRouter({update: protectedProcedure.input(zProjectUpdate).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.id,@@ -98,7 +91,7 @@ export const projectRouter = createTRPCRouter({create: protectedProcedure.input(zOnboardingProject).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;if (!input.organizationId) {throw new TRPCForbiddenError('Organization is required');}@@ -132,7 +125,7 @@ export const projectRouter = createTRPCRouter({delete: protectedProcedure.input(z.object({ projectId: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;// Destroying a project is admin-tier, matching project.create.await ctx.services.auth.requireProjectAdmin({userId,@@ -147,7 +140,7 @@ export const projectRouter = createTRPCRouter({cancelDeletion: protectedProcedure.input(z.object({ projectId: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAdmin({userId,projectId: input.projectId,diff --git a/packages/core/src/modules/realtime/realtime.rpc.ts b/packages/core/src/modules/realtime/realtime.rpc.tsindex 1b3ae48af..a5b5053a7 100644--- a/packages/core/src/modules/realtime/realtime.rpc.ts+++ b/packages/core/src/modules/realtime/realtime.rpc.ts@@ -15,12 +15,7 @@// (M10-002); every procedure here reaches it through `ctx.services.auth`.import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';import {getRealtimeActiveSessions,getRealtimeCoordinates,@@ -47,26 +42,15 @@ const realtimeBadgeDetailScopeSchema = z.enum(['merged',]);-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireReadAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}-export const realtimeRouter = createTRPCRouter({coordinates: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getRealtimeCoordinates(ctx, input.projectId);}),@@ -82,35 +66,55 @@ export const realtimeRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getRealtimeMapBadgeDetails(ctx, input);}),activeSessions: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getRealtimeActiveSessions(ctx, input.projectId);}),paths: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getRealtimePaths(ctx, input.projectId);}),referrals: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getRealtimeReferrals(ctx, input.projectId);}),geo: protectedProcedure.input(z.object({ projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getRealtimeGeo(ctx, input.projectId);}),diff --git a/packages/core/src/modules/reference/reference.rpc.ts b/packages/core/src/modules/reference/reference.rpc.tsindex 8bbfbb007..2b038cf2c 100644--- a/packages/core/src/modules/reference/reference.rpc.ts+++ b/packages/core/src/modules/reference/reference.rpc.ts@@ -22,22 +22,15 @@ import {protectedProcedure,publicProcedure,} from '../../rpc/base';-import { TRPCAccessError, TRPCForbiddenError } from '../../rpc/errors';+import { TRPCForbiddenError } from '../../rpc/errors';import { zRange } from '../report/report.constants';import { zCreateReference } from './reference.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const referenceRouter = createTRPCRouter({getReferences: protectedProcedure.input(z.object({ projectId: z.string(), cursor: z.number().optional() })).query(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const access = await ctx.services.auth.getProjectAccess({userId,projectId: input.projectId,@@ -51,7 +44,6 @@ export const referenceRouter = createTRPCRouter({create: protectedProcedure.input(zCreateReference).mutation(({ input, ctx }) => {- requireLogin(ctx.session.userId);return ctx.services.reference.createReference(input);}),@@ -65,7 +57,7 @@ export const referenceRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const existing = await ctx.services.reference.getReferenceByIdOrThrow(input.id);@@ -80,7 +72,7 @@ export const referenceRouter = createTRPCRouter({delete: protectedProcedure.input(z.object({ id: z.string() })).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;const existing = await ctx.services.reference.getReferenceByIdOrThrow(input.id);diff --git a/packages/core/src/modules/report/report.rpc.ts b/packages/core/src/modules/report/report.rpc.tsindex 46917d2e3..168667fef 100644--- a/packages/core/src/modules/report/report.rpc.ts+++ b/packages/core/src/modules/report/report.rpc.ts@@ -13,12 +13,8 @@// check that fires.import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError, TRPCNotFoundError } from '../../rpc/errors';+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';+import { TRPCNotFoundError } from '../../rpc/errors';import { zReport } from './report.constants';const zReportLayout = z.object({@@ -32,29 +28,6 @@ const zReportLayout = z.object({maxH: z.number().optional(),});-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireReadAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}--async function requireWriteAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'write',- });-}-export const reportRouter = createTRPCRouter({list: protectedProcedure.input(@@ -64,7 +37,6 @@ export const reportRouter = createTRPCRouter({})).query(async ({ input: { dashboardId, projectId }, ctx }) => {- requireLogin(ctx.session.userId);const dashboard = await ctx.services.dashboard.getDashboardById(dashboardId,projectId@@ -85,7 +57,11 @@ export const reportRouter = createTRPCRouter({.mutation(async ({ input: { report, dashboardId }, ctx }) => {const dbDashboard =await ctx.services.dashboard.getDashboardByIdOrThrow(dashboardId);- await requireWriteAccess(ctx, dbDashboard.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dbDashboard.projectId,+ level: 'write',+ });return ctx.services.report.createReport({dashboardId,projectId: dbDashboard.projectId,@@ -102,7 +78,11 @@ export const reportRouter = createTRPCRouter({).mutation(async ({ input: { report, reportId }, ctx }) => {const dbReport = await ctx.services.report.getReportByIdOrThrow(reportId);- await requireWriteAccess(ctx, dbReport.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dbReport.projectId,+ level: 'write',+ });return ctx.services.report.updateReport({ reportId, report });}),@@ -115,7 +95,11 @@ export const reportRouter = createTRPCRouter({).mutation(async ({ input: { reportId, dashboardId }, ctx }) => {const dbReport = await ctx.services.report.getReportByIdOrThrow(reportId);- await requireWriteAccess(ctx, dbReport.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dbReport.projectId,+ level: 'write',+ });return ctx.services.report.moveReport({ report: dbReport, dashboardId });}),@@ -127,7 +111,11 @@ export const reportRouter = createTRPCRouter({).mutation(async ({ input: { reportId }, ctx }) => {const dbReport = await ctx.services.report.getReportByIdOrThrow(reportId);- await requireWriteAccess(ctx, dbReport.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dbReport.projectId,+ level: 'write',+ });return ctx.services.report.deleteReport(reportId);}),@@ -139,7 +127,11 @@ export const reportRouter = createTRPCRouter({).mutation(async ({ input: { reportId }, ctx }) => {const dbReport = await ctx.services.report.getReportByIdOrThrow(reportId);- await requireWriteAccess(ctx, dbReport.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dbReport.projectId,+ level: 'write',+ });return ctx.services.report.duplicateReport(dbReport);}),@@ -154,7 +146,11 @@ export const reportRouter = createTRPCRouter({if (!report) {throw new TRPCNotFoundError('Report not found');}- await requireReadAccess(ctx, report.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: report.projectId,+ level: 'read',+ });return report;}),@@ -167,7 +163,11 @@ export const reportRouter = createTRPCRouter({).mutation(async ({ input: { reportId, layout }, ctx }) => {const dbReport = await ctx.services.report.getReportByIdOrThrow(reportId);- await requireWriteAccess(ctx, dbReport.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: dbReport.projectId,+ level: 'write',+ });return ctx.services.report.updateReportLayout({ reportId, layout });}),@@ -179,7 +179,11 @@ export const reportRouter = createTRPCRouter({})).query(async ({ input: { dashboardId, projectId }, ctx }) => {- await requireReadAccess(ctx, projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId,+ level: 'read',+ });// The access check above only proves the caller owns `projectId`. Bind// the caller-supplied `dashboardId` to that project as well, otherwise a@@ -203,7 +207,11 @@ export const reportRouter = createTRPCRouter({})).mutation(async ({ input: { dashboardId, projectId }, ctx }) => {- await requireWriteAccess(ctx, projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId,+ level: 'write',+ });// Same as `getLayouts`: bind the dashboard to the access-checked project// before deleting anything, so a foreign dashboard cannot be wiped.diff --git a/packages/core/src/modules/session/session.rpc.ts b/packages/core/src/modules/session/session.rpc.tsindex 75820ad9a..a1fe464a5 100644--- a/packages/core/src/modules/session/session.rpc.ts+++ b/packages/core/src/modules/session/session.rpc.ts@@ -12,12 +12,7 @@// not ported.import { z } from 'zod';-import {- createTRPCRouter,- protectedProcedure,- type TrpcContext,-} from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';+import { createTRPCRouter, protectedProcedure } from '../../rpc/base';import { zChartEventFilter } from '../report/report.constants';import {getSessionById,@@ -29,21 +24,6 @@ import {const DEFAULT_LIST_TAKE = 50;-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}--async function requireReadAccess(ctx: TrpcContext, projectId: string) {- await ctx.services.auth.requireProjectAccess({- userId: requireLogin(ctx.session.userId),- projectId,- level: 'read',- });-}-export const sessionRouter = createTRPCRouter({list: protectedProcedure.input(@@ -59,7 +39,11 @@ export const sessionRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getSessionList(ctx, {...input,@@ -75,7 +59,11 @@ export const sessionRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getSessionDistinctValues(ctx, input.projectId, input.field);}),@@ -83,7 +71,11 @@ export const sessionRouter = createTRPCRouter({byId: protectedProcedure.input(z.object({ sessionId: z.string(), projectId: z.string() })).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getSessionById(ctx, input.sessionId, input.projectId);}),@@ -97,7 +89,11 @@ export const sessionRouter = createTRPCRouter({})).query(async ({ input, ctx }) => {- await requireReadAccess(ctx, input.projectId);+ await ctx.services.auth.requireProjectAccess({+ userId: ctx.session.userId,+ projectId: input.projectId,+ level: 'read',+ });return getSessionReplayChunksFrom(ctx,diff --git a/packages/core/src/modules/share/share.rpc.ts b/packages/core/src/modules/share/share.rpc.tsindex 8f98d74ae..0940716b2 100644--- a/packages/core/src/modules/share/share.rpc.ts+++ b/packages/core/src/modules/share/share.rpc.ts@@ -21,20 +21,12 @@ import {protectedProcedure,publicProcedure,} from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import {zShareDashboard,zShareOverview,zShareReport,} from './share.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const shareRouter = createTRPCRouter({overview: publicProcedure.input(z.object({ shareId: z.string() }))@@ -45,14 +37,12 @@ export const shareRouter = createTRPCRouter({overviewSettings: protectedProcedure.input(z.object({ projectId: z.string() })).query(({ input, ctx }) => {- requireLogin(ctx.session.userId);return ctx.services.share.getShareOverviewSettings(input.projectId);}),createOverview: protectedProcedure.input(zShareOverview).mutation(({ input, ctx }) => {- requireLogin(ctx.session.userId);return ctx.services.share.createShareOverview(input);}),@@ -65,7 +55,6 @@ export const shareRouter = createTRPCRouter({dashboardSettings: protectedProcedure.input(z.object({ projectId: z.string(), dashboardId: z.string() })).query(({ input, ctx }) => {- requireLogin(ctx.session.userId);return ctx.services.share.getShareDashboardSettings(input.projectId,input.dashboardId@@ -75,7 +64,7 @@ export const shareRouter = createTRPCRouter({createDashboard: protectedProcedure.input(zShareDashboard).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,@@ -99,7 +88,6 @@ export const shareRouter = createTRPCRouter({reportSettings: protectedProcedure.input(z.object({ projectId: z.string(), reportId: z.string() })).query(({ input, ctx }) => {- requireLogin(ctx.session.userId);return ctx.services.share.getShareReportSettings(input.projectId,input.reportId@@ -109,7 +97,7 @@ export const shareRouter = createTRPCRouter({createReport: protectedProcedure.input(zShareReport).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.auth.requireProjectAccess({userId,projectId: input.projectId,diff --git a/packages/core/src/modules/subscription/subscription.rpc.ts b/packages/core/src/modules/subscription/subscription.rpc.tsindex 5eccdb015..be3214d11 100644--- a/packages/core/src/modules/subscription/subscription.rpc.ts+++ b/packages/core/src/modules/subscription/subscription.rpc.ts@@ -13,20 +13,12 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import {zCancelSubscription,zCheckout,zPauseSubscription,} from './subscription.constants';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const subscriptionRouter = createTRPCRouter({getCurrent: protectedProcedure.input(z.object({ organizationId: z.string() }))@@ -40,7 +32,7 @@ export const subscriptionRouter = createTRPCRouter({.input(zCheckout).mutation(({ input, ctx }) =>ctx.services.subscription.checkout(- requireLogin(ctx.session.userId),+ ctx.session.userId,input,ctx.remoteAddress)@@ -61,26 +53,20 @@ export const subscriptionRouter = createTRPCRouter({cancelSubscription: protectedProcedure.input(zCancelSubscription).mutation(({ input, ctx }) =>- ctx.services.subscription.cancelSubscription(- requireLogin(ctx.session.userId),- input- )+ ctx.services.subscription.cancelSubscription(ctx.session.userId, input)),pauseSubscription: protectedProcedure.input(zPauseSubscription).mutation(({ input, ctx }) =>- ctx.services.subscription.pauseSubscription(- requireLogin(ctx.session.userId),- input- )+ ctx.services.subscription.pauseSubscription(ctx.session.userId, input)),resumeSubscription: protectedProcedure.input(z.object({ organizationId: z.string() })).mutation(({ input, ctx }) =>ctx.services.subscription.resumeSubscription(- requireLogin(ctx.session.userId),+ ctx.session.userId,input.organizationId)),@@ -89,7 +75,7 @@ export const subscriptionRouter = createTRPCRouter({.input(z.object({ organizationId: z.string() })).mutation(({ input, ctx }) =>ctx.services.subscription.applySaveDiscount(- requireLogin(ctx.session.userId),+ ctx.session.userId,input.organizationId)),@@ -97,9 +83,6 @@ export const subscriptionRouter = createTRPCRouter({portal: protectedProcedure.input(z.object({ organizationId: z.string() })).mutation(({ input, ctx }) =>- ctx.services.subscription.portal(- requireLogin(ctx.session.userId),- input.organizationId- )+ ctx.services.subscription.portal(ctx.session.userId, input.organizationId)),});diff --git a/packages/core/src/modules/user/user.rpc.ts b/packages/core/src/modules/user/user.rpc.tsindex a6fa8d596..9f6fdca4d 100644--- a/packages/core/src/modules/user/user.rpc.ts+++ b/packages/core/src/modules/user/user.rpc.ts@@ -12,24 +12,16 @@import { z } from 'zod';import { createTRPCRouter, protectedProcedure } from '../../rpc/base';-import { TRPCAccessError } from '../../rpc/errors';import { deleteSessionTokenCookie } from '../auth/auth.service';-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-export const userRouter = createTRPCRouter({deletionBlockers: protectedProcedure.query(async ({ ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;return ctx.services.user.listUserDeletionBlockers(userId);}),delete: protectedProcedure.mutation(async ({ ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;await ctx.services.user.deleteUserAccount(userId);deleteSessionTokenCookie(ctx.config, ctx.setCookie);return true;@@ -43,7 +35,7 @@ export const userRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- const userId = requireLogin(ctx.session.userId);+ const userId = ctx.session.userId;return ctx.services.user.updateUserProfile({ userId, ...input });}),@@ -55,7 +47,6 @@ export const userRouter = createTRPCRouter({})).mutation(async ({ ctx, input }) => {- requireLogin(ctx.session.userId);ctx.setCookie('debugCookie', new Date().toISOString(), {domain: input.domain,sameSite: input.sameSite,@@ -73,7 +64,6 @@ export const userRouter = createTRPCRouter({})).query(async ({ ctx, input }) => {- requireLogin(ctx.session.userId);ctx.setCookie('debugCookie', new Date().toISOString(), {domain: input.domain,sameSite: input.sameSite,diff --git a/packages/core/src/modules/widget/widget.rpc.ts b/packages/core/src/modules/widget/widget.rpc.tsindex ba8d8994c..ead0dc617 100644--- a/packages/core/src/modules/widget/widget.rpc.ts+++ b/packages/core/src/modules/widget/widget.rpc.ts@@ -42,7 +42,7 @@ import {protectedProcedure,publicProcedure,} from '../../rpc/base';-import { TRPCAccessError, TRPCNotFoundError } from '../../rpc/errors';+import { TRPCNotFoundError } from '../../rpc/errors';import { chQuery } from '../../shared/ch-query';import { TABLE_NAMES } from '../../shared/ch-tables';import { getSettingsForProject } from '../organization/organization.service';@@ -60,13 +60,6 @@ function loadCache() {return import('@openpanel/redis').then((m) => m.getCache);}-function requireLogin(userId: string | null | undefined): string {- if (!userId) {- throw new TRPCAccessError('Not authenticated');- }- return userId;-}-// Helper to find widget by projectId and typeasync function findWidgetByType(db: Ctx['db'],@@ -86,7 +79,6 @@ export const widgetRouter = createTRPCRouter({get: protectedProcedure.input(z.object({ projectId: z.string(), type: zWidgetType })).query(async ({ input, ctx }) => {- requireLogin(ctx.session.userId);const widget = await findWidgetByType(ctx.db,input.projectId,@@ -111,7 +103,6 @@ export const widgetRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- requireLogin(ctx.session.userId);const db = ctx.db;const existing = await findWidgetByType(ctx.db,@@ -158,7 +149,6 @@ export const widgetRouter = createTRPCRouter({})).mutation(async ({ input, ctx }) => {- requireLogin(ctx.session.userId);const db = ctx.db;const existing = await findWidgetByType(ctx.db,diff --git a/packages/core/src/rpc/base.ts b/packages/core/src/rpc/base.tsindex bd1e86082..51ceb71b1 100644--- a/packages/core/src/rpc/base.ts+++ b/packages/core/src/rpc/base.ts@@ -14,9 +14,9 @@ import superjson from 'superjson';import { ZodError, z } from 'zod';import type { HttpCtx, Session } from '../context';import type { Logger } from '../logger';-import { EMPTY_SESSION } from '../modules/auth/src/login-session';import { runWithAlsSession } from '../modules/session/src/session-context';import { type CookieOptions, serializeCookie } from '../shared/cookie';+import { EMPTY_SESSION } from '../shared/session';import { TRPCForbiddenError } from './errors';/**@@ -125,14 +125,19 @@ export const procedure = t.procedure;// ---------------------------------------------------------------------------const enforceUserIsAuthed = t.middleware(async ({ ctx, next }) => {- if (!ctx.session?.userId) {+ const session = ctx.session;+ if (!session?.userId) {throw new TRPCError({ code: 'UNAUTHORIZED', message: 'Not authenticated' });}try {+ // Narrowed, not merely copied: the spread of the checked union member is+ // what gives every handler below a `session.userId` of type `string`, so+ // a procedure reads it instead of re-deriving it through a per-file+ // `requireLogin` (ADR-022 R10 — 38 of those, deleted at M15-007).return next({ctx: {- session: { ...ctx.session },+ session: { ...session },},});} catch (error) {diff --git a/packages/core/src/shared/session.ts b/packages/core/src/shared/session.tsnew file mode 100644index 000000000..0a9179f6c--- /dev/null+++ b/packages/core/src/shared/session.ts@@ -0,0 +1,16 @@+// The one "nobody is signed in" session value.+//+// It lives below every transport on purpose (ADR-022 R22): `rpc/base.ts` maps+// `HttpCtx.session()`'s `null` onto it at the tRPC boundary, and+// `modules/auth/src/login-session.ts` returns it from every non-session branch+// of `validateSessionToken`. Defining it in the module and reaching for it+// from `rpc/` was the shortest path to working code and an upward import; one+// constant at the bottom of the stack is the same behaviour with no edge.++import type { Session } from '../context';++export const EMPTY_SESSION: Session = {+ session: null,+ user: null,+ userId: null,+};