fix readme

- Remove unused orgMemberMiddleware (org procedures use helper functions)
- Remove orgMemberProcedure from base.ts
- Simplify superuserMiddleware using inline concat syntax
- Import OrgInfo/OrgMembership from context.ts instead of redefining

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

README.md

@@ -55,7 +55,7 @@ publisher-dashboard/
 
 ### Prerequisites
 
-- [Bun](https://bun.sh/) v1.1.42+
+- [Bun](https://bun.sh/) v1.3.5+
 - [devenv](https://devenv.sh/) for development environment management
 
 ### Environment Variables

apps/api-server/src/__tests__/e2e/admin.test.ts

@@ -29,6 +29,7 @@ import type { Kysely } from "kysely";
 import type { APIContext } from "../../context.js";
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { call } from "@orpc/server";
+import { createLoggingEmailClient } from "@reviq/emails";
 import {
   createTestUser,
   describeE2E,
@@ -39,7 +40,6 @@ import {
   uniqueTestId,
   withTestTransaction,
 } from "@reviq/test-helpers";
-import { createLoggingEmailClient } from "@reviq/emails";
 import { router } from "../../router.js";
 import { COOKIE_NAMES } from "../../utils/cookies.js";
 import { hashToken } from "../../utils/crypto.js";

apps/api-server/src/__tests__/e2e/auth.test.ts

@@ -41,6 +41,7 @@ import type { Kysely } from "kysely";
 import type { APIContext } from "../../context.js";
 import { beforeAll, describe, expect, test } from "bun:test";
 import { call } from "@orpc/server";
+import { createLoggingEmailClient } from "@reviq/emails";
 import {
   createTestUser,
   describeE2E,
@@ -50,7 +51,6 @@ import {
   uniqueTestId,
   withTestTransaction,
 } from "@reviq/test-helpers";
-import { createLoggingEmailClient } from "@reviq/emails";
 import { VirtualAuthenticator } from "@reviq/virtual-authenticator";
 import { router } from "../../router.js";
 import { COOKIE_NAMES } from "../../utils/cookies.js";

apps/api-server/src/__tests__/e2e/me.test.ts

@@ -23,6 +23,7 @@ import type { Kysely } from "kysely";
 import type { APIContext } from "../../context.js";
 import { beforeAll, describe, expect, test } from "bun:test";
 import { call } from "@orpc/server";
+import { createLoggingEmailClient } from "@reviq/emails";
 import {
   createTestUser,
   describeE2E,
@@ -32,7 +33,6 @@ import {
   uniqueTestId,
   withTestTransaction,
 } from "@reviq/test-helpers";
-import { createLoggingEmailClient } from "@reviq/emails";
 import { router } from "../../router.js";
 import { COOKIE_NAMES } from "../../utils/cookies.js";
 import { hashToken } from "../../utils/crypto.js";

apps/api-server/src/__tests__/e2e/orgs.test.ts

@@ -14,6 +14,7 @@ import type { Kysely } from "kysely";
 import type { APIContext } from "../../context.js";
 import { beforeAll, describe, expect, test } from "bun:test";
 import { call } from "@orpc/server";
+import { createLoggingEmailClient } from "@reviq/emails";
 import {
   createTestUser,
   describeE2E,
@@ -23,7 +24,6 @@ import {
   uniqueTestId,
   withTestTransaction,
 } from "@reviq/test-helpers";
-import { createLoggingEmailClient } from "@reviq/emails";
 import { router } from "../../router.js";
 import { COOKIE_NAMES } from "../../utils/cookies.js";
 import { hashToken } from "../../utils/crypto.js";

apps/api-server/src/__tests__/e2e/webauthn.test.ts

@@ -12,6 +12,7 @@ import type { Kysely } from "kysely";
 import type { APIContext } from "../../context.js";
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { call } from "@orpc/server";
+import { createLoggingEmailClient } from "@reviq/emails";
 import {
   createTestUser,
   describeE2E,
@@ -23,7 +24,6 @@ import {
   uniqueTestId,
   withTestTransaction,
 } from "@reviq/test-helpers";
-import { createLoggingEmailClient } from "@reviq/emails";
 import { VirtualAuthenticator } from "@reviq/virtual-authenticator";
 import { router } from "../../router.js";
 import { COOKIE_NAMES } from "../../utils/cookies.js";

apps/api-server/src/context.ts

@@ -115,3 +115,34 @@ export interface SuperuserContext extends AuthenticatedContext {
   /** User with superuser privileges */
   user: SessionUser & { isSuperuser: true };
 }
+
+/**
+ * Organization info in context
+ */
+export interface OrgInfo {
+  id: number;
+  slug: string;
+  displayName: string;
+  logoUrl: string | null;
+  createdAt: Date;
+}
+
+/**
+ * User's membership in an org
+ */
+export interface OrgMembership {
+  id: number;
+  role: "owner" | "admin" | "member";
+  createdAt: Date;
+}
+
+/**
+ * Org member context for org-scoped procedures
+ * Requires user to be a member of the org
+ */
+export interface OrgMemberContext extends AuthenticatedContext {
+  /** The organization */
+  org: OrgInfo;
+  /** User's membership in the org */
+  membership: OrgMembership;
+}

apps/api-server/src/middleware/auth.ts

@@ -1,181 +0,0 @@
-/**
- * Authentication middleware for oRPC server
- *
- * Handles authentication via:
- * - Session cookie (rev.session_token) - for browser clients
- * - API key header (x-api-key) - for CLI and programmatic access
- */
-
-import type {
-  APIContext,
-  AuthenticatedContext,
-  AuthInfo,
-  Session,
-  SessionUser,
-} from "../context.js";
-import { ORPCError } from "@orpc/server";
-import { COOKIE_NAMES, getCookie } from "../utils/cookies.js";
-import { hashToken } from "../utils/crypto.js";
-
-/**
- * Create the auth middleware function
- * This returns a middleware handler that can be used with oRPC procedures
- */
-export const createAuthMiddleware = () => {
-  return async ({
-    context,
-    next,
-  }: {
-    context: APIContext;
-    next: (opts: {
-      context: Omit<AuthenticatedContext, keyof APIContext>;
-    }) => Promise<unknown>;
-  }) => {
-    const { db, reqHeaders } = context;
-
-    // Try session cookie first
-    let tokenHash: string | undefined;
-    const sessionToken = getCookie(reqHeaders, COOKIE_NAMES.SESSION_TOKEN);
-    if (sessionToken) {
-      tokenHash = await hashToken(sessionToken);
-    }
-
-    // Fall back to API key header (for CLI)
-    const apiKey = reqHeaders.get("x-api-key");
-    if (!tokenHash && apiKey) {
-      tokenHash = await hashToken(apiKey);
-    }
-
-    if (!tokenHash) {
-      throw new ORPCError("UNAUTHORIZED", { message: "No session or API key" });
-    }
-
-    // Look up session (check not expired and not revoked)
-    const session = await db
-      .selectFrom("sessions")
-      .where("token_hash", "=", tokenHash)
-      .where("expires_at", ">", new Date())
-      .where("revoked_at", "is", null)
-      .selectAll()
-      .executeTakeFirst();
-
-    // Fall back to API token if no session found
-    const apiToken = !session
-      ? await db
-          .selectFrom("api_tokens")
-          .where("token_hash", "=", tokenHash)
-          .where("expires_at", ">", new Date())
-          .selectAll()
-          .executeTakeFirst()
-      : undefined;
-
-    const userId = session?.user_id ?? apiToken?.user_id;
-    if (!userId) {
-      throw new ORPCError("UNAUTHORIZED", {
-        message: "Invalid or expired token",
-      });
-    }
-
-    // Update last_used_at for API tokens
-    if (apiToken) {
-      await db
-        .updateTable("api_tokens")
-        .set({ last_used_at: new Date() })
-        .where("id", "=", apiToken.id)
-        .execute();
-    }
-
-    // Fetch user details
-    const user = await db
-      .selectFrom("users")
-      .where("id", "=", userId)
-      .select([
-        "id",
-        "email",
-        "display_name",
-        "email_verified_at",
-        "is_superuser",
-      ])
-      .executeTakeFirst();
-
-    if (!user) {
-      throw new ORPCError("UNAUTHORIZED", {
-        message: "User not found",
-      });
-    }
-
-    const sessionUser: SessionUser = {
-      id: user.id,
-      email: user.email,
-      displayName: user.display_name,
-      emailVerifiedAt: user.email_verified_at,
-      isSuperuser: user.is_superuser,
-    };
-
-    // Build session and auth info based on authentication method
-    let sessionInfo: Session;
-    let authInfo: AuthInfo;
-
-    if (session) {
-      sessionInfo = {
-        id: session.id,
-        trustedMode: session.trusted_mode,
-        createdAt: session.created_at,
-      };
-      authInfo = {
-        method: "session",
-        sessionId: session.id,
-        expiresAt: session.expires_at,
-        createdAt: session.created_at,
-      };
-    } else if (apiToken) {
-      sessionInfo = {
-        // For API token auth, create a synthetic session object
-        id: "0",
-        trustedMode: true,
-        createdAt: apiToken.created_at,
-      };
-      authInfo = {
-        method: "api_token",
-        tokenId: apiToken.id,
-        tokenName: apiToken.name,
-        expiresAt: apiToken.expires_at,
-        lastUsedAt: apiToken.last_used_at,
-        createdAt: apiToken.created_at,
-      };
-    } else {
-      // This should never happen since we checked userId above
-      throw new ORPCError("UNAUTHORIZED", {
-        message: "Invalid authentication state",
-      });
-    }
-
-    return next({
-      context: {
-        user: sessionUser,
-        session: sessionInfo,
-        auth: authInfo,
-      },
-    });
-  };
-};
-
-/**
- * Middleware to require superuser access
- */
-export const createSuperuserMiddleware = () => {
-  return async ({
-    context,
-    next,
-  }: {
-    context: AuthenticatedContext;
-    next: () => Promise<unknown>;
-  }) => {
-    if (!context.user.isSuperuser) {
-      throw new ORPCError("FORBIDDEN", {
-        message: "Superuser access required",
-      });
-    }
-    return next();
-  };
-};

apps/api-server/src/middlewares/auth.ts

@@ -0,0 +1,138 @@
+/**
+ * Auth middleware - validates session/API token and adds user to context
+ */
+
+import type { AuthInfo, Session, SessionUser } from "../context.js";
+import { ORPCError } from "@orpc/server";
+import { COOKIE_NAMES, getCookie } from "../utils/cookies.js";
+import { hashToken } from "../utils/crypto.js";
+import { os } from "./os.js";
+
+export const authMiddleware = os.middleware(async ({ context, next }) => {
+  const { db, reqHeaders } = context;
+
+  // Try session cookie first
+  let tokenHash: string | undefined;
+  const sessionToken = getCookie(reqHeaders, COOKIE_NAMES.SESSION_TOKEN);
+  if (sessionToken) {
+    tokenHash = await hashToken(sessionToken);
+  }
+
+  // Fall back to API key header (for CLI)
+  const apiKey = reqHeaders.get("x-api-key");
+  if (!tokenHash && apiKey) {
+    tokenHash = await hashToken(apiKey);
+  }
+
+  if (!tokenHash) {
+    throw new ORPCError("UNAUTHORIZED", { message: "No session or API key" });
+  }
+
+  // Look up session (check not expired and not revoked)
+  const session = await db
+    .selectFrom("sessions")
+    .where("token_hash", "=", tokenHash)
+    .where("expires_at", ">", new Date())
+    .where("revoked_at", "is", null)
+    .selectAll()
+    .executeTakeFirst();
+
+  // Fall back to API token if no session found
+  const apiToken = !session
+    ? await db
+        .selectFrom("api_tokens")
+        .where("token_hash", "=", tokenHash)
+        .where("expires_at", ">", new Date())
+        .selectAll()
+        .executeTakeFirst()
+    : undefined;
+
+  const userId = session?.user_id ?? apiToken?.user_id;
+  if (!userId) {
+    throw new ORPCError("UNAUTHORIZED", {
+      message: "Invalid or expired token",
+    });
+  }
+
+  // Update last_used_at for API tokens
+  if (apiToken) {
+    await db
+      .updateTable("api_tokens")
+      .set({ last_used_at: new Date() })
+      .where("id", "=", apiToken.id)
+      .execute();
+  }
+
+  // Fetch user details
+  const user = await db
+    .selectFrom("users")
+    .where("id", "=", userId)
+    .select([
+      "id",
+      "email",
+      "display_name",
+      "email_verified_at",
+      "is_superuser",
+    ])
+    .executeTakeFirst();
+
+  if (!user) {
+    throw new ORPCError("UNAUTHORIZED", {
+      message: "User not found",
+    });
+  }
+
+  const sessionUser: SessionUser = {
+    id: user.id,
+    email: user.email,
+    displayName: user.display_name,
+    emailVerifiedAt: user.email_verified_at,
+    isSuperuser: user.is_superuser,
+  };
+
+  // Build session and auth info based on authentication method
+  let sessionInfo: Session;
+  let authInfo: AuthInfo;
+
+  if (session) {
+    sessionInfo = {
+      id: session.id,
+      trustedMode: session.trusted_mode,
+      createdAt: session.created_at,
+    };
+    authInfo = {
+      method: "session",
+      sessionId: session.id,
+      expiresAt: session.expires_at,
+      createdAt: session.created_at,
+    };
+  } else if (apiToken) {
+    sessionInfo = {
+      // For API token auth, create a synthetic session object
+      id: "0",
+      trustedMode: true,
+      createdAt: apiToken.created_at,
+    };
+    authInfo = {
+      method: "api_token",
+      tokenId: apiToken.id,
+      tokenName: apiToken.name,
+      expiresAt: apiToken.expires_at,
+      lastUsedAt: apiToken.last_used_at,
+      createdAt: apiToken.created_at,
+    };
+  } else {
+    // This should never happen since we checked userId above
+    throw new ORPCError("UNAUTHORIZED", {
+      message: "Invalid authentication state",
+    });
+  }
+
+  return next({
+    context: {
+      user: sessionUser,
+      session: sessionInfo,
+      auth: authInfo,
+    },
+  });
+});

apps/api-server/src/middlewares/index.ts

@@ -0,0 +1,8 @@
+/**
+ * Middleware exports
+ */
+
+export { authMiddleware } from "./auth.js";
+export { loginRequestMiddleware } from "./login-request.js";
+export { os } from "./os.js";
+export { superuserMiddleware } from "./superuser.js";

apps/api-server/src/middlewares/login-request.ts

@@ -0,0 +1,64 @@
+/**
+ * Login request middleware - validates login request token from cookie
+ */
+
+import type { SessionUser } from "../context.js";
+import { ORPCError } from "@orpc/server";
+import { COOKIE_NAMES, getCookie } from "../utils/cookies.js";
+import { os } from "./os.js";
+
+export const loginRequestMiddleware = os.middleware(
+  async ({ context, next }) => {
+    const { db, reqHeaders } = context;
+
+    // Read login request token from cookie
+    const loginRequestToken = getCookie(
+      reqHeaders,
+      COOKIE_NAMES.LOGIN_REQUEST_TOKEN,
+    );
+
+    if (!loginRequestToken) {
+      throw new ORPCError("BAD_REQUEST", {
+        message: "No login request found",
+      });
+    }
+
+    // Fetch login request with user data by token
+    const result = await db
+      .selectFrom("login_requests")
+      .innerJoin("users", "users.id", "login_requests.user_id")
+      .select([
+        "login_requests.id",
+        "login_requests.user_id",
+        "login_requests.expires_at",
+        "users.email",
+        "users.display_name",
+        "users.email_verified_at",
+        "users.is_superuser",
+      ])
+      .where("login_requests.token", "=", loginRequestToken)
+      .where("login_requests.expires_at", ">", new Date())
+      .executeTakeFirst();
+
+    if (!result) {
+      throw new ORPCError("BAD_REQUEST", {
+        message: "Login request expired or not found",
+      });
+    }
+
+    const sessionUser: SessionUser = {
+      id: result.user_id,
+      email: result.email,
+      displayName: result.display_name,
+      emailVerifiedAt: result.email_verified_at,
+      isSuperuser: result.is_superuser,
+    };
+
+    return next({
+      context: {
+        loginRequestId: Number(result.id),
+        user: sessionUser,
+      },
+    });
+  },
+);

apps/api-server/src/middlewares/os.ts

@@ -0,0 +1,10 @@
+/**
+ * Base implementer with typed APIContext
+ * All procedures and middlewares should derive from this
+ */
+
+import type { APIContext } from "../context.js";
+import { implement } from "@orpc/server";
+import { contract } from "@reviq/api-contract";
+
+export const os = implement(contract).$context<APIContext>();

apps/api-server/src/middlewares/superuser.ts

@@ -0,0 +1,19 @@
+/**
+ * Superuser middleware - authenticates and requires superuser access
+ *
+ * This middleware chains authMiddleware first, then checks for superuser.
+ */
+
+import { ORPCError } from "@orpc/server";
+import { authMiddleware } from "./auth.js";
+
+export const superuserMiddleware = authMiddleware.concat(
+  async ({ context, next }) => {
+    if (!context.user.isSuperuser) {
+      throw new ORPCError("FORBIDDEN", {
+        message: "Superuser access required",
+      });
+    }
+    return next();
+  },
+);

apps/api-server/src/procedures/admin/auth/complete-login.ts

@@ -3,12 +3,11 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 
-export const adminAuthCompleteLogin = os.admin.auth.completeLogin
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminAuthCompleteLogin =
+  superuserProcedure.admin.auth.completeLogin.handler(
+    async ({ input, context }) => {
       const email = input.email.toLowerCase();
 
       // First check if any login request exists for this email
@@ -48,4 +47,5 @@ export const adminAuthCompleteLogin = os.admin.auth.completeLogin
         .execute();
 
       return { success: true };
-  });
+    },
+  );

apps/api-server/src/procedures/admin/orgs/create.ts

@@ -3,12 +3,10 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 
-export const adminOrgsCreate = os.admin.orgs.create
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminOrgsCreate = superuserProcedure.admin.orgs.create.handler(
+  async ({ input, context }) => {
     const { slug, displayName, ownerEmail } = input;
 
     // Find owner user by email (outside transaction - read-only)
@@ -55,4 +53,5 @@ export const adminOrgsCreate = os.admin.orgs.create
     });
 
     return { slug };
-  });
+  },
+);

apps/api-server/src/procedures/admin/orgs/delete.ts

@@ -3,12 +3,10 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 
-export const adminOrgsDelete = os.admin.orgs.delete
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminOrgsDelete = superuserProcedure.admin.orgs.delete.handler(
+  async ({ input, context }) => {
     const { slug } = input;
 
     // Delete org and related records in transaction
@@ -35,4 +33,5 @@ export const adminOrgsDelete = os.admin.orgs.delete
     });
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/admin/orgs/get.ts

@@ -3,13 +3,11 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 import { toOrgResponse } from "../helpers.js";
 
-export const adminOrgsGet = os.admin.orgs.get
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminOrgsGet = superuserProcedure.admin.orgs.get.handler(
+  async ({ input, context }) => {
     const org = await context.db
       .selectFrom("orgs")
       .where("slug", "=", input.slug)
@@ -19,4 +17,5 @@ export const adminOrgsGet = os.admin.orgs.get
       throw new ORPCError("NOT_FOUND", { message: "Organization not found" });
     }
     return toOrgResponse(org);
-  });
+  },
+);

apps/api-server/src/procedures/admin/orgs/list.ts

@@ -2,13 +2,12 @@
  * admin.orgs.list - List all organizations
  */
 
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 import { toOrgResponse } from "../helpers.js";
 
-export const adminOrgsList = os.admin.orgs.list
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ context }) => {
+export const adminOrgsList = superuserProcedure.admin.orgs.list.handler(
+  async ({ context }) => {
     const orgs = await context.db.selectFrom("orgs").selectAll().execute();
     return orgs.map(toOrgResponse);
-  });
+  },
+);

apps/api-server/src/procedures/admin/orgs/sites.ts

@@ -4,13 +4,12 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 import { toSiteResponse } from "../helpers.js";
 
-export const adminOrgsListSites = os.admin.orgs.listSites
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminOrgsListSites =
+  superuserProcedure.admin.orgs.listSites.handler(
+    async ({ input, context }) => {
       const { slug } = input;
 
       const org = await context.db
@@ -29,12 +28,11 @@ export const adminOrgsListSites = os.admin.orgs.listSites
         .execute();
 
       return sites.map(toSiteResponse);
-  });
+    },
+  );
 
-export const adminOrgsAddSite = os.admin.orgs.addSite
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminOrgsAddSite = superuserProcedure.admin.orgs.addSite.handler(
+  async ({ input, context }) => {
     const { slug, domain } = input;
 
     // Use transaction to prevent race condition on site creation
@@ -70,12 +68,12 @@ export const adminOrgsAddSite = os.admin.orgs.addSite
     });
 
     return { success: true };
-  });
+  },
+);
 
-export const adminOrgsRemoveSite = os.admin.orgs.removeSite
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminOrgsRemoveSite =
+  superuserProcedure.admin.orgs.removeSite.handler(
+    async ({ input, context }) => {
       const { slug, domain } = input;
 
       const org = await context.db
@@ -98,4 +96,5 @@ export const adminOrgsRemoveSite = os.admin.orgs.removeSite
       }
 
       return { success: true };
-  });
+    },
+  );

apps/api-server/src/procedures/admin/orgs/update.ts

@@ -3,12 +3,10 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 
-export const adminOrgsUpdate = os.admin.orgs.update
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminOrgsUpdate = superuserProcedure.admin.orgs.update.handler(
+  async ({ input, context }) => {
     const { slug, displayName, logoUrl } = input;
 
     // Check if there are actual updates to make
@@ -49,4 +47,5 @@ export const adminOrgsUpdate = os.admin.orgs.update
     }
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/admin/users/confirm-email.ts

@@ -3,12 +3,11 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 
-export const adminUsersConfirmEmail = os.admin.users.confirmEmail
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminUsersConfirmEmail =
+  superuserProcedure.admin.users.confirmEmail.handler(
+    async ({ input, context }) => {
       const result = await context.db
         .updateTable("users")
         .set({
@@ -23,4 +22,5 @@ export const adminUsersConfirmEmail = os.admin.users.confirmEmail
       }
 
       return { success: true };
-  });
+    },
+  );

apps/api-server/src/procedures/admin/users/create.ts

@@ -3,12 +3,10 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 
-export const adminUsersCreate = os.admin.users.create
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminUsersCreate = superuserProcedure.admin.users.create.handler(
+  async ({ input, context }) => {
     const { email, name, orgSlug, orgRole } = input;
     const normalizedEmail = email.toLowerCase();
 
@@ -62,4 +60,5 @@ export const adminUsersCreate = os.admin.users.create
     });
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/admin/users/get.ts

@@ -3,13 +3,11 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 import { toUserResponse } from "../helpers.js";
 
-export const adminUsersGet = os.admin.users.get
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminUsersGet = superuserProcedure.admin.users.get.handler(
+  async ({ input, context }) => {
     const user = await context.db
       .selectFrom("users")
       .where("email", "=", input.email.toLowerCase())
@@ -19,4 +17,5 @@ export const adminUsersGet = os.admin.users.get
       throw new ORPCError("NOT_FOUND", { message: "User not found" });
     }
     return toUserResponse(user);
-  });
+  },
+);

apps/api-server/src/procedures/admin/users/list.ts

@@ -2,13 +2,12 @@
  * admin.users.list - List all users
  */
 
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 import { toUserResponse } from "../helpers.js";
 
-export const adminUsersList = os.admin.users.list
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ context }) => {
+export const adminUsersList = superuserProcedure.admin.users.list.handler(
+  async ({ context }) => {
     const users = await context.db.selectFrom("users").selectAll().execute();
     return users.map(toUserResponse);
-  });
+  },
+);

apps/api-server/src/procedures/admin/users/update.ts

@@ -3,12 +3,10 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os, superuserMiddleware } from "../../base.js";
+import { superuserProcedure } from "../../base.js";
 
-export const adminUsersUpdate = os.admin.users.update
-  .use(authMiddleware)
-  .use(superuserMiddleware)
-  .handler(async ({ input, context }) => {
+export const adminUsersUpdate = superuserProcedure.admin.users.update.handler(
+  async ({ input, context }) => {
     const { email, isSuperuser } = input;
     const normalizedEmail = email.toLowerCase();
 
@@ -47,4 +45,5 @@ export const adminUsersUpdate = os.admin.users.update
     }
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/auth/login-if-completed.ts

@@ -122,7 +122,8 @@ export const loginIfRequestIsCompleted =
           .execute();
 
         return { session: newSession, deviceTrusted: trusted };
-      });
+      },
+    );
 
     // Set session cookie
     setCookie(

apps/api-server/src/procedures/auth/logout.ts

@@ -3,7 +3,7 @@
  */
 
 import { COOKIE_NAMES, deleteCookie } from "../../utils/cookies.js";
-import { authMiddleware, os } from "../base.js";
+import { authedProcedure } from "../base.js";
 
 /**
  * Logout handler
@@ -11,9 +11,8 @@ import { authMiddleware, os } from "../base.js";
  * - Revokes the current session by setting revoked_at to now()
  * - Clears the session cookie from the response
  */
-export const logout = os.auth.logout
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const logout = authedProcedure.auth.logout.handler(
+  async ({ context }) => {
     // Revoke the current session
     await context.db
       .updateTable("sessions")
@@ -25,4 +24,5 @@ export const logout = os.auth.logout
     deleteCookie(context.resHeaders, COOKIE_NAMES.SESSION_TOKEN);
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/auth/resend-verification.ts

@@ -16,11 +16,10 @@ import {
   generateExpiry,
   generateSecureBase58Token,
 } from "../../utils/crypto.js";
-import { authMiddleware, os } from "../base.js";
+import { authedProcedure } from "../base.js";
 
-export const resendVerificationEmail = os.auth.resendVerificationEmail
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const resendVerificationEmail =
+  authedProcedure.auth.resendVerificationEmail.handler(async ({ context }) => {
     // Check if email is already verified
     if (context.user.emailVerifiedAt !== null) {
       // Email already verified, return early

apps/api-server/src/procedures/base.ts

@@ -8,227 +8,22 @@
 import type {
   APIContext,
   AuthenticatedContext,
-  AuthInfo,
   LoginRequestContext,
-  Session,
-  SessionUser,
 } from "../context.js";
-import { implement, ORPCError } from "@orpc/server";
-import { contract } from "@reviq/api-contract";
-import { COOKIE_NAMES, getCookie } from "../utils/cookies.js";
-import { hashToken } from "../utils/crypto.js";
+import {
+  authMiddleware,
+  loginRequestMiddleware,
+  os,
+  superuserMiddleware,
+} from "../middlewares/index.js";
 
-/**
- * Base implementer with typed APIContext
- * All procedures should be derived from this
- */
-export const os = implement(contract).$context<APIContext>();
+// Re-export middlewares and os
+export { authMiddleware, loginRequestMiddleware, os, superuserMiddleware };
 
-/**
- * Auth middleware - validates session/API token and adds user to context
- * Use with os.use(authMiddleware) to create authenticated procedures
- */
-export const authMiddleware = os.middleware(async ({ context, next }) => {
-  const { db, reqHeaders } = context;
-
-  // Try session cookie first
-  let tokenHash: string | undefined;
-  const sessionToken = getCookie(reqHeaders, COOKIE_NAMES.SESSION_TOKEN);
-  if (sessionToken) {
-    tokenHash = await hashToken(sessionToken);
-  }
-
-  // Fall back to API key header (for CLI)
-  const apiKey = reqHeaders.get("x-api-key");
-  if (!tokenHash && apiKey) {
-    tokenHash = await hashToken(apiKey);
-  }
-
-  if (!tokenHash) {
-    throw new ORPCError("UNAUTHORIZED", { message: "No session or API key" });
-  }
-
-  // Look up session (check not expired and not revoked)
-  const session = await db
-    .selectFrom("sessions")
-    .where("token_hash", "=", tokenHash)
-    .where("expires_at", ">", new Date())
-    .where("revoked_at", "is", null)
-    .selectAll()
-    .executeTakeFirst();
-
-  // Fall back to API token if no session found
-  const apiToken = !session
-    ? await db
-        .selectFrom("api_tokens")
-        .where("token_hash", "=", tokenHash)
-        .where("expires_at", ">", new Date())
-        .selectAll()
-        .executeTakeFirst()
-    : undefined;
-
-  const userId = session?.user_id ?? apiToken?.user_id;
-  if (!userId) {
-    throw new ORPCError("UNAUTHORIZED", {
-      message: "Invalid or expired token",
-    });
-  }
-
-  // Update last_used_at for API tokens
-  if (apiToken) {
-    await db
-      .updateTable("api_tokens")
-      .set({ last_used_at: new Date() })
-      .where("id", "=", apiToken.id)
-      .execute();
-  }
-
-  // Fetch user details
-  const user = await db
-    .selectFrom("users")
-    .where("id", "=", userId)
-    .select([
-      "id",
-      "email",
-      "display_name",
-      "email_verified_at",
-      "is_superuser",
-    ])
-    .executeTakeFirst();
-
-  if (!user) {
-    throw new ORPCError("UNAUTHORIZED", {
-      message: "User not found",
-    });
-  }
-
-  const sessionUser: SessionUser = {
-    id: user.id,
-    email: user.email,
-    displayName: user.display_name,
-    emailVerifiedAt: user.email_verified_at,
-    isSuperuser: user.is_superuser,
-  };
-
-  // Build session and auth info based on authentication method
-  let sessionInfo: Session;
-  let authInfo: AuthInfo;
-
-  if (session) {
-    sessionInfo = {
-      id: session.id,
-      trustedMode: session.trusted_mode,
-      createdAt: session.created_at,
-    };
-    authInfo = {
-      method: "session",
-      sessionId: session.id,
-      expiresAt: session.expires_at,
-      createdAt: session.created_at,
-    };
-  } else if (apiToken) {
-    sessionInfo = {
-      // For API token auth, create a synthetic session object
-      id: "0",
-      trustedMode: true,
-      createdAt: apiToken.created_at,
-    };
-    authInfo = {
-      method: "api_token",
-      tokenId: apiToken.id,
-      tokenName: apiToken.name,
-      expiresAt: apiToken.expires_at,
-      lastUsedAt: apiToken.last_used_at,
-      createdAt: apiToken.created_at,
-    };
-  } else {
-    // This should never happen since we checked userId above
-    throw new ORPCError("UNAUTHORIZED", {
-      message: "Invalid authentication state",
-    });
-  }
-
-  return next({
-    context: {
-      user: sessionUser,
-      session: sessionInfo,
-      auth: authInfo,
-    },
-  });
-});
-
-/**
- * Login request middleware - validates login request token from cookie
- */
-export const loginRequestMiddleware = os.middleware(
-  async ({ context, next }) => {
-    const { db, reqHeaders } = context;
-
-    // Read login request token from cookie
-    const loginRequestToken = getCookie(
-      reqHeaders,
-      COOKIE_NAMES.LOGIN_REQUEST_TOKEN,
-    );
-
-    if (!loginRequestToken) {
-      throw new ORPCError("BAD_REQUEST", {
-        message: "No login request found",
-      });
-    }
-
-    // Fetch login request with user data by token
-    const result = await db
-      .selectFrom("login_requests")
-      .innerJoin("users", "users.id", "login_requests.user_id")
-      .select([
-        "login_requests.id",
-        "login_requests.user_id",
-        "login_requests.expires_at",
-        "users.email",
-        "users.display_name",
-        "users.email_verified_at",
-        "users.is_superuser",
-      ])
-      .where("login_requests.token", "=", loginRequestToken)
-      .where("login_requests.expires_at", ">", new Date())
-      .executeTakeFirst();
-
-    if (!result) {
-      throw new ORPCError("BAD_REQUEST", {
-        message: "Login request expired or not found",
-      });
-    }
-
-    const sessionUser: SessionUser = {
-      id: result.user_id,
-      email: result.email,
-      displayName: result.display_name,
-      emailVerifiedAt: result.email_verified_at,
-      isSuperuser: result.is_superuser,
-    };
-
-    return next({
-      context: {
-        loginRequestId: Number(result.id),
-        user: sessionUser,
-      },
-    });
-  },
-);
-
-/**
- * Superuser middleware - requires admin access (must be used after authMiddleware)
- */
-export const superuserMiddleware = os.middleware(async ({ context, next }) => {
-  // This middleware should be used after authMiddleware
-  const ctx = context as AuthenticatedContext;
-  if (!ctx.user.isSuperuser) {
-    throw new ORPCError("FORBIDDEN", {
-      message: "Superuser access required",
-    });
-  }
-  return next();
-});
+// Pre-configured procedures with middleware applied
+export const authedProcedure = os.use(authMiddleware);
+export const superuserProcedure = os.use(superuserMiddleware);
+export const loginRequestProcedure = os.use(loginRequestMiddleware);
 
 // Type exports for use in procedure files
 export type { APIContext, AuthenticatedContext, LoginRequestContext };

apps/api-server/src/procedures/me/_base.ts

@@ -0,0 +1,7 @@
+/**
+ * Base route for me procedures with auth middleware applied
+ */
+
+import { authedProcedure } from "../base.js";
+
+export const meRoute = authedProcedure.me;

apps/api-server/src/procedures/me/api-tokens.ts

@@ -9,7 +9,7 @@ import {
   hashToken,
   TOKEN_PREFIX,
 } from "../../utils/crypto.js";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
 /** Token expiration: 365 days */
 const TOKEN_EXPIRATION_DAYS = 365;
@@ -18,9 +18,8 @@ const TOKEN_EXPIRATION_DAYS = 365;
  * List all API tokens for the current user
  * Returns token metadata (not the actual token values)
  */
-export const listApiTokens = os.me.apiTokens.list
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const listApiTokens = meRoute.apiTokens.list.handler(
+  async ({ context }) => {
     const tokens = await context.db
       .selectFrom("api_tokens")
       .select(["id", "name", "last_used_at", "created_at", "expires_at"])
@@ -35,15 +34,15 @@ export const listApiTokens = os.me.apiTokens.list
       createdAt: token.created_at.toISOString(),
       expiresAt: token.expires_at.toISOString(),
     }));
-  });
+  },
+);
 
 /**
  * Create a new API token
  * Requires superuser status and trusted session
  */
-export const createApiToken = os.me.apiTokens.create
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const createApiToken = meRoute.apiTokens.create.handler(
+  async ({ input, context }) => {
     // Require superuser status
     if (!context.user.isSuperuser) {
       throw new ORPCError("FORBIDDEN", {
@@ -85,14 +84,14 @@ export const createApiToken = os.me.apiTokens.create
       token,
       expiresAt: expiresAt.toISOString(),
     };
-  });
+  },
+);
 
 /**
  * Delete an API token
  */
-export const deleteApiToken = os.me.apiTokens.delete
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const deleteApiToken = meRoute.apiTokens.delete.handler(
+  async ({ input, context }) => {
     const result = await context.db
       .deleteFrom("api_tokens")
       .where("id", "=", input.tokenId.toString())
@@ -106,4 +105,5 @@ export const deleteApiToken = os.me.apiTokens.delete
     }
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/me/auth-status.ts

@@ -2,11 +2,9 @@
  * Get current user auth status
  */
 
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
-export const meAuthStatus = os.me.authStatus
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const meAuthStatus = meRoute.authStatus.handler(async ({ context }) => {
   const user = await context.db
     .selectFrom("users")
     .select([
@@ -38,4 +36,4 @@ export const meAuthStatus = os.me.authStatus
     },
     auth: context.auth,
   };
-  });
+});

apps/api-server/src/procedures/me/delete.ts

@@ -5,7 +5,7 @@
 import { ORPCError } from "@orpc/server";
 import { COOKIE_NAMES, deleteCookie } from "../../utils/cookies.js";
 import { verifyPassword } from "../../utils/password.js";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
 /**
  * Delete account handler
@@ -14,9 +14,7 @@ import { authMiddleware, os } from "../base.js";
  * - Deletes user record (cascades to sessions, devices, passkeys, etc.)
  * - Clears session cookie
  */
-export const meDelete = os.me.delete
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const meDelete = meRoute.delete.handler(async ({ input, context }) => {
   const { password } = input;
 
   // Fetch user with password hash
@@ -49,4 +47,4 @@ export const meDelete = os.me.delete
   deleteCookie(context.resHeaders, COOKIE_NAMES.SESSION_TOKEN);
 
   return { success: true };
-  });
+});

apps/api-server/src/procedures/me/devices.ts

@@ -3,7 +3,7 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 import { defaultDeviceName, requireDeviceFingerprint } from "./helpers.js";
 
 /**
@@ -13,9 +13,8 @@ import { defaultDeviceName, requireDeviceFingerprint } from "./helpers.js";
  * @throws BAD_REQUEST if no device fingerprint found
  * @throws NOT_FOUND if device doesn't exist
  */
-export const getDeviceInfo = os.me.devices.getInfo
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const getDeviceInfo = meRoute.devices.getInfo.handler(
+  async ({ context }) => {
     const fingerprint = requireDeviceFingerprint(context.reqHeaders);
 
     const device = await context.db
@@ -39,7 +38,8 @@ export const getDeviceInfo = os.me.devices.getInfo
       lastUsedAt: device.last_used_at,
       isTrusted: device.is_trusted,
     };
-  });
+  },
+);
 
 /**
  * Trust device handler
@@ -48,9 +48,8 @@ export const getDeviceInfo = os.me.devices.getInfo
  * @throws BAD_REQUEST if no device fingerprint found
  * @throws NOT_FOUND if device doesn't exist
  */
-export const trustDevice = os.me.devices.trust
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const trustDevice = meRoute.devices.trust.handler(
+  async ({ input, context }) => {
     const { name } = input;
     const fingerprint = requireDeviceFingerprint(context.reqHeaders);
 
@@ -66,16 +65,16 @@ export const trustDevice = os.me.devices.trust
     }
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * List trusted devices handler
  * - Requires authentication
  * - Returns all trusted devices for the current user
  */
-export const listTrustedDevices = os.me.devices.listTrusted
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const listTrustedDevices = meRoute.devices.listTrusted.handler(
+  async ({ context }) => {
     const devices = await context.db
       .selectFrom("user_devices")
       .selectAll()
@@ -94,7 +93,8 @@ export const listTrustedDevices = os.me.devices.listTrusted
       lastUsedAt: d.last_used_at,
       isTrusted: d.is_trusted,
     }));
-  });
+  },
+);
 
 /**
  * Untrust device handler
@@ -102,9 +102,8 @@ export const listTrustedDevices = os.me.devices.listTrusted
  * - Marks device as untrusted by ID
  * @throws NOT_FOUND if device doesn't exist
  */
-export const untrustDevice = os.me.devices.untrust
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const untrustDevice = meRoute.devices.untrust.handler(
+  async ({ input, context }) => {
     const result = await context.db
       .updateTable("user_devices")
       .set({ is_trusted: false })
@@ -117,16 +116,16 @@ export const untrustDevice = os.me.devices.untrust
     }
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Revoke all trusted devices handler
  * - Requires authentication
  * - Marks all devices as untrusted
  */
-export const revokeAllTrustedDevices = os.me.devices.revokeAll
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const revokeAllTrustedDevices = meRoute.devices.revokeAll.handler(
+  async ({ context }) => {
     await context.db
       .updateTable("user_devices")
       .set({ is_trusted: false })
@@ -134,4 +133,5 @@ export const revokeAllTrustedDevices = os.me.devices.revokeAll
       .execute();
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/me/get.ts

@@ -2,11 +2,9 @@
  * Get current user profile
  */
 
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
-export const meGet = os.me.get
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const meGet = meRoute.get.handler(async ({ context }) => {
   const user = await context.db
     .selectFrom("users")
     .select([
@@ -35,4 +33,4 @@ export const meGet = os.me.get
     isSuperuser: user.is_superuser,
     hasPassword: user.password_hash !== null,
   };
-  });
+});

apps/api-server/src/procedures/me/invites.ts

@@ -3,15 +3,13 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
 /**
  * List pending invites for the current user
  * Only returns invites where the user's email matches and email is verified
  */
-export const listInvites = os.me.invites.list
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const listInvites = meRoute.invites.list.handler(async ({ context }) => {
   // Only show invites if email is verified
   if (!context.user.emailVerifiedAt) {
     return [];
@@ -52,15 +50,14 @@ export const listInvites = os.me.invites.list
     createdAt: i.created_at,
     expiresAt: i.expires_at,
   }));
-  });
+});
 
 /**
  * Get a specific invite by ID
  * Only returns if the invite belongs to the current user's email
  */
-export const getInvite = os.me.invites.get
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const getInvite = meRoute.invites.get.handler(
+  async ({ input, context }) => {
     const { inviteId } = input;
 
     // Only show invite if email is verified
@@ -111,15 +108,15 @@ export const getInvite = os.me.invites.get
       createdAt: invite.created_at,
       expiresAt: invite.expires_at,
     };
-  });
+  },
+);
 
 /**
  * Accept an invite by ID
  * Adds user to org and deletes the invite
  */
-export const acceptInvite = os.me.invites.accept
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const acceptInvite = meRoute.invites.accept.handler(
+  async ({ input, context }) => {
     const { inviteId } = input;
 
     // Only allow accepting if email is verified
@@ -183,15 +180,15 @@ export const acceptInvite = os.me.invites.accept
     }
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Decline an invite
  * Deletes the invite if it belongs to the current user's email
  */
-export const declineInvite = os.me.invites.decline
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const declineInvite = meRoute.invites.decline.handler(
+  async ({ input, context }) => {
     const { inviteId } = input;
 
     // Delete the invite only if it matches user's email
@@ -208,4 +205,5 @@ export const declineInvite = os.me.invites.decline
     }
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/me/passkeys.ts

@@ -4,16 +4,15 @@
 
 import { ORPCError } from "@orpc/server";
 import { getUserPasskeys } from "../../utils/webauthn.js";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
 /**
  * List passkeys handler
  * - Requires authentication
  * - Returns all passkeys for the current user
  */
-export const listPasskeys = os.me.passkeys.list
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const listPasskeys = meRoute.passkeys.list.handler(
+  async ({ context }) => {
     const passkeys = await getUserPasskeys(context.db, context.user.id);
 
     return passkeys.map((p) => ({
@@ -22,7 +21,8 @@ export const listPasskeys = os.me.passkeys.list
       createdAt: p.createdAt,
       lastUsedAt: p.lastUsedAt,
     }));
-  });
+  },
+);
 
 /**
  * Rename passkey handler
@@ -30,9 +30,8 @@ export const listPasskeys = os.me.passkeys.list
  * - Updates passkey name
  * @throws NOT_FOUND if passkey doesn't exist
  */
-export const renamePasskey = os.me.passkeys.rename
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const renamePasskey = meRoute.passkeys.rename.handler(
+  async ({ input, context }) => {
     const { passkeyId, name } = input;
 
     const result = await context.db
@@ -47,7 +46,8 @@ export const renamePasskey = os.me.passkeys.rename
     }
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Delete passkey handler
@@ -57,9 +57,8 @@ export const renamePasskey = os.me.passkeys.rename
  * @throws NOT_FOUND if passkey doesn't exist
  * @throws BAD_REQUEST if trying to delete last passkey without password
  */
-export const deletePasskey = os.me.passkeys.delete
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const deletePasskey = meRoute.passkeys.delete.handler(
+  async ({ input, context }) => {
     const { passkeyId } = input;
 
     // Use transaction to prevent race condition when checking last passkey
@@ -96,4 +95,5 @@ export const deletePasskey = os.me.passkeys.delete
     });
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/me/sessions.ts

@@ -3,7 +3,7 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
 /**
  * List sessions handler
@@ -11,9 +11,8 @@ import { authMiddleware, os } from "../base.js";
  * - Returns all sessions for the current user
  * - Includes isCurrent flag to identify active session
  */
-export const listSessions = os.me.sessions.list
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const listSessions = meRoute.sessions.list.handler(
+  async ({ context }) => {
     const sessions = await context.db
       .selectFrom("sessions")
       .selectAll()
@@ -33,7 +32,8 @@ export const listSessions = os.me.sessions.list
       isCurrent: s.id === context.session.id,
       revokedAt: s.revoked_at,
     }));
-  });
+  },
+);
 
 /**
  * Revoke session handler
@@ -42,9 +42,8 @@ export const listSessions = os.me.sessions.list
  * @throws NOT_FOUND if session doesn't exist
  * @throws BAD_REQUEST if trying to revoke current session
  */
-export const revokeSession = os.me.sessions.revoke
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const revokeSession = meRoute.sessions.revoke.handler(
+  async ({ input, context }) => {
     const { sessionId } = input;
 
     // Prevent revoking current session (use logout instead)
@@ -67,16 +66,16 @@ export const revokeSession = os.me.sessions.revoke
     }
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Revoke all sessions handler
  * - Requires authentication
  * - Revokes all sessions except current
  */
-export const revokeAllSessions = os.me.sessions.revokeAll
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const revokeAllSessions = meRoute.sessions.revokeAll.handler(
+  async ({ context }) => {
     // Revoke all sessions except current
     await context.db
       .updateTable("sessions")
@@ -87,4 +86,5 @@ export const revokeAllSessions = os.me.sessions.revokeAll
       .execute();
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/me/set-password.ts

@@ -8,7 +8,7 @@ import {
   validatePassword,
   verifyPassword,
 } from "../../utils/password.js";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
 /**
  * Set password handler
@@ -16,9 +16,8 @@ import { authMiddleware, os } from "../base.js";
  * - If user has existing password, currentPassword is required
  * - Validates new password strength using zxcvbn
  */
-export const setPassword = os.me.setPassword
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const setPassword = meRoute.setPassword.handler(
+  async ({ input, context }) => {
     const { currentPassword, newPassword } = input;
 
     // Fetch current password hash
@@ -60,4 +59,5 @@ export const setPassword = os.me.setPassword
       .execute();
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/me/setup-profile.ts

@@ -2,11 +2,10 @@
  * Setup user profile (initial setup after signup)
  */
 
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
-export const setupProfile = os.me.setupProfile
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const setupProfile = meRoute.setupProfile.handler(
+  async ({ input, context }) => {
     const { displayName, fullName, phoneNumber } = input;
 
     await context.db
@@ -21,4 +20,5 @@ export const setupProfile = os.me.setupProfile
       .execute();
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/me/update-profile.ts

@@ -3,7 +3,7 @@
  */
 
 import type { ProfileUpdate } from "./helpers.js";
-import { authMiddleware, os } from "../base.js";
+import { meRoute } from "./_base.js";
 
 /**
  * Update profile handler
@@ -11,9 +11,8 @@ import { authMiddleware, os } from "../base.js";
  * - Allows partial updates to display_name, full_name, phone_number, avatar_url
  * - Automatically sets updated_at timestamp
  */
-export const updateProfile = os.me.updateProfile
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const updateProfile = meRoute.updateProfile.handler(
+  async ({ input, context }) => {
     const updates: Partial<ProfileUpdate> = {};
     if (input.displayName !== undefined) {
       updates.display_name = input.displayName;
@@ -38,4 +37,5 @@ export const updateProfile = os.me.updateProfile
     }
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/orgs/basic.ts

@@ -3,15 +3,14 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os } from "../base.js";
+import { authedProcedure } from "../base.js";
 import { getMembership, lookupOrgBySlug } from "./helpers.js";
 
 /**
  * List all orgs the current user is a member of
  */
-export const orgsList = os.orgs.list
-  .use(authMiddleware)
-  .handler(async ({ context }) => {
+export const orgsList = authedProcedure.orgs.list.handler(
+  async ({ context }) => {
     const orgs = await context.db
       .selectFrom("org_members")
       .innerJoin("orgs", "orgs.id", "org_members.org_id")
@@ -33,15 +32,15 @@ export const orgsList = os.orgs.list
       logoUrl: o.logo_url,
       createdAt: o.created_at,
     }));
-  });
+  },
+);
 
 /**
  * Create a new org
  * The creating user becomes the owner
  */
-export const orgsCreate = os.orgs.create
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const orgsCreate = authedProcedure.orgs.create.handler(
+  async ({ input, context }) => {
     const { slug, displayName } = input;
 
     try {
@@ -75,15 +74,15 @@ export const orgsCreate = os.orgs.create
       }
       throw error;
     }
-  });
+  },
+);
 
 /**
  * Get a single org by slug
  * Requires membership
  */
-export const orgsGet = os.orgs.get
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const orgsGet = authedProcedure.orgs.get.handler(
+  async ({ input, context }) => {
     const { slug } = input;
 
     // Lookup org and verify membership
@@ -97,4 +96,5 @@ export const orgsGet = os.orgs.get
       logoUrl: org.logoUrl,
       createdAt: org.createdAt,
     };
-  });
+  },
+);

apps/api-server/src/procedures/orgs/helpers.ts

@@ -5,25 +5,11 @@
 
 import type { DB, OrgRole } from "@reviq/db-schema";
 import type { Kysely } from "kysely";
+import type { OrgInfo, OrgMembership } from "../../context.js";
 import { ORPCError } from "@orpc/server";
 
-// ===== Types =====
-
-/** Org info returned from lookup */
-export interface OrgInfo {
-  id: number;
-  slug: string;
-  displayName: string;
-  logoUrl: string | null;
-  createdAt: Date;
-}
-
-/** User's membership in an org */
-export interface OrgMembership {
-  id: number;
-  role: OrgRole;
-  createdAt: Date;
-}
+// Re-export types for convenience
+export type { OrgInfo, OrgMembership };
 
 // ===== Role Hierarchy =====
 

apps/api-server/src/procedures/orgs/invites.ts

@@ -9,16 +9,15 @@ import {
   generateExpiry,
   generateSecureBase58Token,
 } from "../../utils/crypto.js";
-import { authMiddleware, os } from "../base.js";
+import { authedProcedure } from "../base.js";
 import { getMembership, lookupOrgBySlug, requireRole } from "./helpers.js";
 
 /**
  * List pending invites for an org
  * Requires admin or owner role
  */
-export const invitesList = os.orgs.invites.list
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const invitesList = authedProcedure.orgs.invites.list.handler(
+  async ({ input, context }) => {
     const { slug } = input;
 
     // Lookup org and verify admin+ role
@@ -52,16 +51,16 @@ export const invitesList = os.orgs.invites.list
       createdAt: i.created_at,
       expiresAt: i.expires_at,
     }));
-  });
+  },
+);
 
 /**
  * Create an invite for a new member
  * Requires admin or owner role
  * Only owners can invite new owners (privilege escalation prevention)
  */
-export const invitesCreate = os.orgs.invites.create
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const invitesCreate = authedProcedure.orgs.invites.create.handler(
+  async ({ input, context }) => {
     const { slug, email: rawEmail, role } = input;
     const email = rawEmail.toLowerCase();
 
@@ -135,15 +134,15 @@ export const invitesCreate = os.orgs.invites.create
     });
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Cancel a pending invite
  * Requires admin or owner role
  */
-export const invitesCancel = os.orgs.invites.cancel
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const invitesCancel = authedProcedure.orgs.invites.cancel.handler(
+  async ({ input, context }) => {
     const { slug, inviteId } = input;
 
     // Lookup org and verify admin+ role
@@ -163,16 +162,16 @@ export const invitesCancel = os.orgs.invites.cancel
     }
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Accept an invitation
  * Token-based lookup, requires auth but no org membership
  * Handles race condition if user is already a member
  */
-export const invitesAccept = os.orgs.invites.accept
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const invitesAccept = authedProcedure.orgs.invites.accept.handler(
+  async ({ input, context }) => {
     const { token } = input;
 
     // Find the invite by token (must not be expired)
@@ -235,4 +234,5 @@ export const invitesAccept = os.orgs.invites.accept
     }
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/orgs/management.ts

@@ -3,7 +3,7 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os } from "../base.js";
+import { authedProcedure } from "../base.js";
 import {
   countOwners,
   getMembership,
@@ -15,9 +15,8 @@ import {
  * Update org details
  * Requires admin or owner role
  */
-export const orgsUpdate = os.orgs.update
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const orgsUpdate = authedProcedure.orgs.update.handler(
+  async ({ input, context }) => {
     const { slug, displayName, logoUrl } = input;
 
     // Lookup org and verify membership with admin+ role
@@ -41,16 +40,16 @@ export const orgsUpdate = os.orgs.update
       .execute();
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Delete an org
  * Requires owner role
  * FK CASCADE handles deleting members, invites, and sites
  */
-export const orgsDelete = os.orgs.delete
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const orgsDelete = authedProcedure.orgs.delete.handler(
+  async ({ input, context }) => {
     const { slug } = input;
 
     // Lookup org and verify ownership
@@ -61,16 +60,16 @@ export const orgsDelete = os.orgs.delete
     await context.db.deleteFrom("orgs").where("id", "=", org.id).execute();
 
     return { success: true };
-  });
+  },
+);
 
 /**
  * Leave an org
  * Cannot leave if you're the only owner
  * Uses transaction to prevent race condition where multiple owners leave simultaneously
  */
-export const orgsLeave = os.orgs.leave
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const orgsLeave = authedProcedure.orgs.leave.handler(
+  async ({ input, context }) => {
     const { slug } = input;
 
     // Lookup org and get membership
@@ -98,4 +97,5 @@ export const orgsLeave = os.orgs.leave
     });
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/orgs/members.ts

@@ -3,7 +3,7 @@
  */
 
 import { ORPCError } from "@orpc/server";
-import { authMiddleware, os } from "../base.js";
+import { authedProcedure } from "../base.js";
 import {
   countOwners,
   getMembership,
@@ -15,9 +15,8 @@ import {
  * List all members of an org
  * Any member can view the member list
  */
-export const membersList = os.orgs.members.list
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const membersList = authedProcedure.orgs.members.list.handler(
+  async ({ input, context }) => {
     const { slug } = input;
 
     // Lookup org and verify membership
@@ -48,21 +47,26 @@ export const membersList = os.orgs.members.list
       role: m.role,
       createdAt: m.created_at,
     }));
-  });
+  },
+);
 
 /**
  * Update a member's role
  * Only owners can change roles
  * Uses transaction to prevent race condition when demoting owners
  */
-export const membersUpdateRole = os.orgs.members.updateRole
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const membersUpdateRole =
+  authedProcedure.orgs.members.updateRole.handler(
+    async ({ input, context }) => {
       const { slug, userId, role: newRole } = input;
 
       // Lookup org and verify ownership
       const org = await lookupOrgBySlug(context.db, slug);
-    const membership = await getMembership(context.db, org.id, context.user.id);
+      const membership = await getMembership(
+        context.db,
+        org.id,
+        context.user.id,
+      );
       requireRole(membership, "owner");
 
       await context.db.transaction().execute(async (trx) => {
@@ -97,16 +101,16 @@ export const membersUpdateRole = os.orgs.members.updateRole
       });
 
       return { success: true };
-  });
+    },
+  );
 
 /**
  * Remove a member from an org
  * Owners can remove anyone, admins can only remove members
  * Uses transaction to prevent race condition when removing owners
  */
-export const membersRemove = os.orgs.members.remove
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const membersRemove = authedProcedure.orgs.members.remove.handler(
+  async ({ input, context }) => {
     const { slug, userId } = input;
 
     // Lookup org and verify membership
@@ -159,4 +163,5 @@ export const membersRemove = os.orgs.members.remove
     });
 
     return { success: true };
-  });
+  },
+);

apps/api-server/src/procedures/orgs/sites.ts

@@ -2,16 +2,15 @@
  * Org sites procedures - list
  */
 
-import { authMiddleware, os } from "../base.js";
+import { authedProcedure } from "../base.js";
 import { getMembership, lookupOrgBySlug } from "./helpers.js";
 
 /**
  * List all sites for an org
  * Any member can view the site list
  */
-export const sitesList = os.orgs.sites.list
-  .use(authMiddleware)
-  .handler(async ({ input, context }) => {
+export const sitesList = authedProcedure.orgs.sites.list.handler(
+  async ({ input, context }) => {
     const { slug } = input;
 
     // Lookup org and verify membership
@@ -31,4 +30,5 @@ export const sitesList = os.orgs.sites.list
       domain: s.domain,
       createdAt: s.created_at,
     }));
-  });
+  },
+);

apps/api-server/src/utils/auth.ts

@@ -1,75 +0,0 @@
-/**
- * Authentication utilities for token handling
- */
-
-import type { Database } from "@reviq/db-schema";
-import type { Kysely } from "kysely";
-import { hashToken } from "./crypto.js";
-
-export interface AuthenticatedUser {
-  id: number;
-  email: string;
-  isSuperuser: boolean;
-}
-
-/**
- * Authenticate a request using session token or API key
- * Returns the authenticated user or null if not authenticated
- */
-export const authenticateRequest = async (
-  db: Kysely<Database>,
-  sessionToken?: string,
-  apiKey?: string,
-): Promise<AuthenticatedUser | null> => {
-  // Try session cookie first, then API key
-  const token = sessionToken ?? apiKey;
-  if (!token) {
-    return null;
-  }
-
-  const tokenHash = await hashToken(token);
-
-  // Check sessions table
-  const session = await db
-    .selectFrom("sessions")
-    .innerJoin("users", "users.id", "sessions.user_id")
-    .where("sessions.token_hash", "=", tokenHash)
-    .where("sessions.expires_at", ">", new Date())
-    .where("sessions.revoked_at", "is", null)
-    .select(["users.id", "users.email", "users.is_superuser"])
-    .executeTakeFirst();
-
-  if (session) {
-    return {
-      id: session.id,
-      email: session.email,
-      isSuperuser: session.is_superuser,
-    };
-  }
-
-  // Check API tokens table
-  const apiToken = await db
-    .selectFrom("api_tokens")
-    .innerJoin("users", "users.id", "api_tokens.user_id")
-    .where("api_tokens.token_hash", "=", tokenHash)
-    .where("api_tokens.expires_at", ">", new Date())
-    .select(["users.id", "users.email", "users.is_superuser"])
-    .executeTakeFirst();
-
-  if (apiToken) {
-    // Update last_used_at
-    await db
-      .updateTable("api_tokens")
-      .set({ last_used_at: new Date() })
-      .where("token_hash", "=", tokenHash)
-      .execute();
-
-    return {
-      id: apiToken.id,
-      email: apiToken.email,
-      isSuperuser: apiToken.is_superuser,
-    };
-  }
-
-  return null;
-};

apps/cli/src/routes/auth/status.ts

@@ -20,7 +20,9 @@ function formatRelativeTime(date: Date): string {
 
   if (diffDays === 0) {
     const diffHours = Math.floor(diffMs / (1000 * 60 * 60));
-    return diffHours <= 0 ? "expired" : `in ${diffHours.toLocaleString()} hours`;
+    return diffHours <= 0
+      ? "expired"
+      : `in ${diffHours.toLocaleString()} hours`;
   }
 
   if (diffDays === 1) {

apps/cli/src/routes/completions.ts

@@ -44,7 +44,6 @@ function completions(
   _flags: Record<string, never>,
   shell: Shell,
 ): void {
-  // biome-ignore lint/nursery/noUnnecessaryConditions: switch on union type is valid
   switch (shell) {
     case "bash":
       console.log("To enable bash completions for reviq, run:\n");

apps/publisher-dashboard/src/lib/components/dashboard/tabs/index.ts

@@ -2,5 +2,8 @@ export { default as AdUnitTable } from "./ad-unit-table.svelte";
 export { default as CountryTable } from "./country-table.svelte";
 export { default as DomainTable } from "./domain-table.svelte";
 export { default as KeyValueTable } from "./key-value-table.svelte";
-export { default as MetricsTable, type MetricsRow } from "./metrics-table.svelte";
+export {
+  default as MetricsTable,
+  type MetricsRow,
+} from "./metrics-table.svelte";
 export { default as SourceTable } from "./source-table.svelte";

apps/publisher-dashboard/src/routes/account/api-tokens/+page.svelte

@@ -14,7 +14,6 @@ import { toast } from "svelte-sonner";
 import { goto } from "$app/navigation";
 import { resolve } from "$app/paths";
 import { api } from "$lib/api/client";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Alert, AlertDescription } from "$lib/components/ui/alert";
 import { Badge } from "$lib/components/ui/badge";
 import { Button } from "$lib/components/ui/button";
@@ -25,6 +24,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Input } from "$lib/components/ui/input";
 import { Label } from "$lib/components/ui/label";
 

apps/publisher-dashboard/src/routes/account/devices/+page.svelte

@@ -12,7 +12,6 @@ import { formatRelativeTime } from "@reviq/common";
 import { createQuery, useQueryClient } from "@tanstack/svelte-query";
 import { toast } from "svelte-sonner";
 import { api } from "$lib/api/client";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Alert, AlertDescription } from "$lib/components/ui/alert";
 import { Badge } from "$lib/components/ui/badge";
 import { Button } from "$lib/components/ui/button";
@@ -23,6 +22,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 
 const queryClient = useQueryClient();
 

apps/publisher-dashboard/src/routes/account/sessions/+page.svelte

@@ -15,7 +15,6 @@ import { createQuery, useQueryClient } from "@tanstack/svelte-query";
 import { toast } from "svelte-sonner";
 import { UAParser } from "ua-parser-js";
 import { api } from "$lib/api/client";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Alert, AlertDescription } from "$lib/components/ui/alert";
 import { Badge } from "$lib/components/ui/badge";
 import { Button } from "$lib/components/ui/button";
@@ -26,6 +25,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 
 const queryClient = useQueryClient();
 

apps/publisher-dashboard/src/routes/admin/orgs/+page.svelte

@@ -6,7 +6,6 @@ import { toast } from "svelte-sonner";
 import { resolve } from "$app/paths";
 import { api } from "$lib/api/client.js";
 import { AdminLayout } from "$lib/components/layout";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Button } from "$lib/components/ui/button/index.js";
 import {
   Card,
@@ -14,6 +13,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card/index.js";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Skeleton } from "$lib/components/ui/skeleton/index.js";
 import {
   Table,

apps/publisher-dashboard/src/routes/admin/orgs/[slug]/+page.svelte

@@ -17,7 +17,6 @@ import { page } from "$app/state";
 import { api } from "$lib/api/client";
 import { AdminLayout } from "$lib/components/layout";
 import { OrgAvatar } from "$lib/components/org";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Alert, AlertDescription } from "$lib/components/ui/alert";
 import { Button } from "$lib/components/ui/button";
 import {
@@ -28,6 +27,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Input } from "$lib/components/ui/input";
 import { Label } from "$lib/components/ui/label";
 import {

apps/publisher-dashboard/src/routes/dashboard/[slug]/members/+page.svelte

@@ -13,7 +13,6 @@ import { toast } from "svelte-sonner";
 import { api } from "$lib/api/client";
 import { DashboardLayout } from "$lib/components/layout";
 import { RoleBadge } from "$lib/components/org";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Button } from "$lib/components/ui/button";
 import {
   Card,
@@ -21,6 +20,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Input } from "$lib/components/ui/input";
 import { Label } from "$lib/components/ui/label";
 import {

apps/publisher-dashboard/src/routes/dashboard/[slug]/settings/+page.svelte

@@ -14,7 +14,6 @@ import { goto } from "$app/navigation";
 import { resolve } from "$app/paths";
 import { api } from "$lib/api/client";
 import { SettingsLayout } from "$lib/components/layout";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Alert, AlertDescription } from "$lib/components/ui/alert";
 import { Button } from "$lib/components/ui/button";
 import {
@@ -24,6 +23,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Input } from "$lib/components/ui/input";
 import { Label } from "$lib/components/ui/label";
 

apps/publisher-dashboard/src/routes/dashboard/[slug]/settings/members/+page.svelte

@@ -13,7 +13,6 @@ import { toast } from "svelte-sonner";
 import { api } from "$lib/api/client";
 import { SettingsLayout } from "$lib/components/layout";
 import { RoleBadge } from "$lib/components/org";
-import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Button } from "$lib/components/ui/button";
 import {
   Card,
@@ -21,6 +20,7 @@ import {
   CardHeader,
   CardTitle,
 } from "$lib/components/ui/card";
+import { ConfirmDialog } from "$lib/components/ui/confirm-dialog";
 import { Input } from "$lib/components/ui/input";
 import { Label } from "$lib/components/ui/label";
 import {

packages/db/src/client.test.ts

@@ -15,16 +15,7 @@ const describeE2E = describe.skipIf(SKIP_DB_TESTS);
 
 describe("createDb", () => {
   test("throws error for empty connection string", () => {
-    expect(() => createDb("")).toThrow("Database connection string is required");
-  });
-
-  test("throws error for null-ish connection string", () => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument -- testing edge case
-    expect(() => createDb(null as any)).toThrow(
-      "Database connection string is required",
-    );
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument -- testing edge case
-    expect(() => createDb(undefined as any)).toThrow(
+    expect(() => createDb("")).toThrow(
       "Database connection string is required",
     );
   });

packages/db/src/helpers/execute-bootstrap.test.ts

@@ -42,7 +42,7 @@ let testCounter = 0;
 const uniqueTestId = (): string => {
   const timestamp = Date.now();
   testCounter++;
-  return `${timestamp}-${testCounter.toString()}`;
+  return `${timestamp.toString()}-${testCounter.toString()}`;
 };
 
 /** Truncate all tables */
@@ -95,10 +95,8 @@ describeE2E("[e2e] executeBootstrap", () => {
   });
 
   afterAll(async () => {
-    if (db) {
     await truncateAllTables(db);
     await db.destroy();
-    }
   });
 
   test("creates superuser with correct email and password", async () => {
@@ -263,6 +261,7 @@ describeE2E("[e2e] executeBootstrap", () => {
 
   test("throws error for password less than 8 characters", async () => {
     await withTestTransaction(db, async (trx) => {
+      // eslint-disable-next-line @typescript-eslint/await-thenable, @typescript-eslint/no-confusing-void-expression
       await expect(
         executeBootstrap(trx, {
           email: "admin@example.com",
@@ -274,6 +273,7 @@ describeE2E("[e2e] executeBootstrap", () => {
 
   test("throws error for password exactly 7 characters", async () => {
     await withTestTransaction(db, async (trx) => {
+      // eslint-disable-next-line @typescript-eslint/await-thenable, @typescript-eslint/no-confusing-void-expression
       await expect(
         executeBootstrap(trx, {
           email: "admin@example.com",
@@ -296,6 +296,7 @@ describeE2E("[e2e] executeBootstrap", () => {
 
   test("throws error for invalid email without @", async () => {
     await withTestTransaction(db, async (trx) => {
+      // eslint-disable-next-line @typescript-eslint/await-thenable, @typescript-eslint/no-confusing-void-expression
       await expect(
         executeBootstrap(trx, {
           email: "invalidemail",
@@ -326,6 +327,7 @@ describeE2E("[e2e] executeBootstrap", () => {
       });
 
       // Attempt to create the same user again
+      // eslint-disable-next-line @typescript-eslint/await-thenable, @typescript-eslint/no-confusing-void-expression
       await expect(
         executeBootstrap(trx, {
           email: "admin@example.com",
@@ -552,19 +554,19 @@ describeE2E("[e2e] executeBootstrap", () => {
       });
 
       // Create another org and invite
-      const [otherOrg] = await trx
+      const otherOrg = await trx
         .insertInto("orgs")
         .values({
           slug: `other-org-${uniqueId}`,
           display_name: "Other Org",
         })
         .returning(["id"])
-        .execute();
+        .executeTakeFirstOrThrow();
 
       await trx
         .insertInto("org_invites")
         .values({
-          org_id: otherOrg!.id,
+          org_id: otherOrg.id,
           email: "invitee@example.com",
           role: "member",
           invited_by: result1.user.id,
@@ -611,14 +613,14 @@ describeE2E("[e2e] executeBootstrap", () => {
         .execute();
 
       // Add org invites (to the org, not by the user)
-      const [anotherUser] = await trx
+      const anotherUser = await trx
         .insertInto("users")
         .values({
           email: `other-${uniqueId}@example.com`,
           display_name: "Other User",
         })
         .returning(["id"])
-        .execute();
+        .executeTakeFirstOrThrow();
 
       await trx
         .insertInto("org_invites")
@@ -626,7 +628,7 @@ describeE2E("[e2e] executeBootstrap", () => {
           org_id: result1.org.id,
           email: "invitee@example.com",
           role: "member",
-          invited_by: anotherUser!.id,
+          invited_by: anotherUser.id,
           token: "invite-token-2",
           expires_at: new Date(Date.now() + 86400000),
         })

packages/db/src/helpers/with-transaction.ts

@@ -30,5 +30,5 @@ export async function withTransaction<T>(
   }
 
   // Not in a transaction, start one
-  return (db as Kysely<Database>).transaction().execute(callback);
+  return db.transaction().execute(callback);
 }

packages/testing/test-helpers/src/test-db.ts

@@ -202,9 +202,11 @@ export async function runMigrations(): Promise<void> {
     await client.query(schemaSql);
   } catch (error) {
     // Ignore "already exists" errors - schema may have already been applied
-    const message = error instanceof Error ? error.message : String(error);
+    const message = error instanceof Error ? error.message : "Unknown error";
     if (!message.includes("already exists")) {
-      throw new Error(`Schema application failed: ${message}`);
+      throw error instanceof Error
+        ? error
+        : new Error(`Schema application failed: ${message}`);
     }
   } finally {
     await client.end();