@simple-auth-kit/cli 1.4.3 → 1.5.0

package/registry/combos/express-drizzle/variants/base/src/{auth.service.ts → services/auth.service.ts}

@@ -11,8 +11,14 @@ import {
   signAppleClientSecret,
   verifyIdTokenAndExtractProfile,
 } from "@/lib/auth/core/oauth.js";
-import { requestPasswordReset as coreRequestPasswordReset, resetPassword as coreResetPassword } from "@/lib/auth/core/password-reset.js";
-import { checkRateLimit, type RateLimitDeps } from "@/lib/auth/core/rate-limit.js";
+import {
+  requestPasswordReset as coreRequestPasswordReset,
+  resetPassword as coreResetPassword,
+} from "@/lib/auth/core/password-reset.js";
+import {
+  checkRateLimit,
+  type RateLimitDeps,
+} from "@/lib/auth/core/rate-limit.js";
 import {
   blockUser,
   createSession,
@@ -23,22 +29,47 @@ import {
   revokeSession,
   rotateRefreshToken,
 } from "@/lib/auth/core/session-policy.js";
-import { signAccessToken, signRefreshToken, signTwoFactorChallengeToken, verifyRefreshToken, verifyTwoFactorChallengeToken } from "@/lib/auth/core/token-service.js";
-import { buildTotpProvisioningUri, generateBackupCodes, generateTotpSecret, verifyTotpCode } from "@/lib/auth/core/two-factor.js";
-import type { AuthConfig } from "./auth.config.js";
-import { HttpError } from "./http-error.js";
-import { AuditLogEntry, AuditLogListFilter, AuditLogRepository, toAuditLogEntry } from "./audit-log.repository.js";
-import type { Paginated } from "./pagination.js";
-import type { Database } from "./db.js";
-import { KeyProviderService } from "./key-provider.js";
-import { OAuthRepository } from "./oauth.repository.js";
-import { PasswordResetRepository } from "./password-reset.repository.js";
+import {
+  signAccessToken,
+  signRefreshToken,
+  signTwoFactorChallengeToken,
+  verifyRefreshToken,
+  verifyTwoFactorChallengeToken,
+} from "@/lib/auth/core/token-service.js";
+import {
+  buildTotpProvisioningUri,
+  generateBackupCodes,
+  generateTotpSecret,
+  verifyTotpCode,
+} from "@/lib/auth/core/two-factor.js";
+import type { AuthConfig } from "../auth.config.js";
+import { HttpError } from "../http-error.js";
+import {
+  AuditLogEntry,
+  AuditLogListFilter,
+  AuditLogRepository,
+  toAuditLogEntry,
+} from "../repositories/audit-log.repository.js";
+import type { Paginated } from "../pagination.js";
+import type { Database } from "../db.js";
+import { KeyProviderService } from "../key-provider.js";
+import { OAuthRepository } from "../repositories/oauth.repository.js";
+import { PasswordResetRepository } from "../repositories/password-reset.repository.js";
 import type { Revoker } from "@/lib/auth/core/types.js";
-import { PermissionInput, PermissionSummary, RbacRepository, RoleSummary, toUserSummary, UserListFilter, UserListResult, UserSummary } from "./rbac.repository.js";
-import { sessions, users } from "./schema.js";
-import { SessionRepository } from "./session.repository.js";
-import { TwoFactorRepository } from "./two-factor.repository.js";
-import { toId, toIdOrNull } from "./id.helper.js";
+import {
+  PermissionInput,
+  PermissionSummary,
+  RbacRepository,
+  RoleSummary,
+  toUserSummary,
+  UserListFilter,
+  UserListResult,
+  UserSummary,
+} from "../repositories/rbac.repository.js";
+import { sessions, users } from "../schema.js";
+import { SessionRepository } from "../repositories/session.repository.js";
+import { TwoFactorRepository } from "../repositories/two-factor.repository.js";
+import { toId, toIdOrNull } from "../id.helper.js";
 
 export interface AuthTokens {
   accessToken: string;
@@ -93,7 +124,11 @@ export class AuthService {
     userAgent?: string;
     ip?: string;
   }): Promise<AuthTokens> {
-    const [existing] = await this.db.select().from(users).where(eq(users.email, input.email)).limit(1);
+    const [existing] = await this.db
+      .select()
+      .from(users)
+      .where(eq(users.email, input.email))
+      .limit(1);
     if (existing) throw new HttpError(409, "email already registered");
 
     const passwordHash = await hashPassword(input.password);
@@ -112,100 +147,210 @@ export class AuthService {
     // The signup default is whichever roles are flagged `isDefault` in the database, not a name
     // spelled in code — see rbac.defaults.ts.
     await this.rbac.assignDefaultRoles(user.id);
-    return this.issueSessionTokens(user, { userAgent: input.userAgent, ip: input.ip });
+    return this.issueSessionTokens(user, {
+      userAgent: input.userAgent,
+      ip: input.ip,
+    });
   }
 
   /** Returns full tokens directly, or a short-lived challenge if the account has 2FA enabled — see `loginTwoFactor`. */
-  async login(input: { identifier: string; password: string; userAgent?: string; ip?: string }): Promise<AuthTokens | TwoFactorChallenge> {
-    const { allowed } = await checkRateLimit(this.rateLimit, "login", input.identifier);
+  async login(input: {
+    identifier: string;
+    password: string;
+    userAgent?: string;
+    ip?: string;
+  }): Promise<AuthTokens | TwoFactorChallenge> {
+    const { allowed } = await checkRateLimit(
+      this.rateLimit,
+      "login",
+      input.identifier,
+    );
     if (!allowed) throw new HttpError(429, "too many login attempts");
 
     const [user] = await this.db
       .select()
       .from(users)
-      .where(or(eq(users.email, input.identifier), eq(users.username, input.identifier), eq(users.phone, input.identifier)))
+      .where(
+        or(
+          eq(users.email, input.identifier),
+          eq(users.username, input.identifier),
+          eq(users.phone, input.identifier),
+        ),
+      )
       .limit(1);
-    if (!user || user.blocked || !user.isActive || user.isDeleted || !user.passwordHash) throw new HttpError(401, "invalid credentials");
+    if (
+      !user ||
+      user.blocked ||
+      !user.isActive ||
+      user.isDeleted ||
+      !user.passwordHash
+    )
+      throw new HttpError(401, "invalid credentials");
 
     const valid = await verifyPassword(user.passwordHash, input.password);
     if (!valid) throw new HttpError(401, "invalid credentials");
 
     if (user.twoFactorEnabled) {
       const key = await this.keys.getActiveKey();
-      const { token } = await signTwoFactorChallengeToken({ activeKey: key }, user.id.toString()); // core-facing: sub must be string
+      const { token } = await signTwoFactorChallengeToken(
+        { activeKey: key },
+        user.id.toString(),
+      ); // core-facing: sub must be string
       return { twoFactorRequired: true, challengeToken: token };
     }
 
-    return this.issueSessionTokens(user, { userAgent: input.userAgent, ip: input.ip });
+    return this.issueSessionTokens(user, {
+      userAgent: input.userAgent,
+      ip: input.ip,
+    });
   }
 
   /** Completes the challenge `login()` returned when 2FA is enabled — a TOTP code or an unused backup code. */
-  async loginTwoFactor(input: { challengeToken: string; code: string; userAgent?: string; ip?: string }): Promise<AuthTokens> {
-    const { sub } = await verifyTwoFactorChallengeToken({ secret: this.keys.secret }, input.challengeToken);
+  async loginTwoFactor(input: {
+    challengeToken: string;
+    code: string;
+    userAgent?: string;
+    ip?: string;
+  }): Promise<AuthTokens> {
+    const { sub } = await verifyTwoFactorChallengeToken(
+      { secret: this.keys.secret },
+      input.challengeToken,
+    );
 
-    const [user] = await this.db.select().from(users).where(eq(users.id, toId(sub))).limit(1);
-    if (!user || user.blocked || !user.isActive || user.isDeleted || !user.twoFactorEnabled || !user.twoFactorSecret) throw new HttpError(401, "invalid credentials");
+    const [user] = await this.db
+      .select()
+      .from(users)
+      .where(eq(users.id, toId(sub)))
+      .limit(1);
+    if (
+      !user ||
+      user.blocked ||
+      !user.isActive ||
+      user.isDeleted ||
+      !user.twoFactorEnabled ||
+      !user.twoFactorSecret
+    )
+      throw new HttpError(401, "invalid credentials");
 
     const validTotp = verifyTotpCode(user.twoFactorSecret, input.code);
-    const validBackup = !validTotp && (await this.twoFactor.consumeBackupCode(user.id, input.code));
+    const validBackup =
+      !validTotp &&
+      (await this.twoFactor.consumeBackupCode(user.id, input.code));
     if (!validTotp && !validBackup) {
-      await this.sessions.appendAuditEvent({ type: "two_factor_challenge_failed", userId: user.id.toString() }); // core-facing: string
+      await this.sessions.appendAuditEvent({
+        type: "two_factor_challenge_failed",
+        userId: user.id.toString(),
+      }); // core-facing: string
       throw new HttpError(401, "invalid two-factor code");
     }
 
-    return this.issueSessionTokens(user, { userAgent: input.userAgent, ip: input.ip });
+    return this.issueSessionTokens(user, {
+      userAgent: input.userAgent,
+      ip: input.ip,
+    });
   }
 
-  async enrollTwoFactor(userId: string): Promise<{ secret: string; provisioningUri: string }> {
+  async enrollTwoFactor(
+    userId: string,
+  ): Promise<{ secret: string; provisioningUri: string }> {
     const idBig = toId(userId);
     const user = await this.getUserOrThrow(userId);
     const secret = generateTotpSecret();
     // Not enabled yet — confirmTwoFactor() flips that, so an abandoned enrollment never locks the account out.
-    await this.db.update(users).set({ twoFactorSecret: secret, twoFactorEnabled: false }).where(eq(users.id, idBig));
-    return { secret, provisioningUri: buildTotpProvisioningUri({ secret, accountName: user.email, issuer: this.config.twoFactorIssuer }) };
+    await this.db
+      .update(users)
+      .set({ twoFactorSecret: secret, twoFactorEnabled: false })
+      .where(eq(users.id, idBig));
+    return {
+      secret,
+      provisioningUri: buildTotpProvisioningUri({
+        secret,
+        accountName: user.email,
+        issuer: this.config.twoFactorIssuer,
+      }),
+    };
   }
 
-  async confirmTwoFactor(userId: string, code: string): Promise<{ backupCodes: string[] }> {
+  async confirmTwoFactor(
+    userId: string,
+    code: string,
+  ): Promise<{ backupCodes: string[] }> {
     const idBig = toId(userId);
     const user = await this.getUserOrThrow(userId);
-    if (!user.twoFactorSecret) throw new HttpError(400, "call enrollTwoFactor first");
-    if (!verifyTotpCode(user.twoFactorSecret, code)) throw new HttpError(401, "invalid two-factor code");
+    if (!user.twoFactorSecret)
+      throw new HttpError(400, "call enrollTwoFactor first");
+    if (!verifyTotpCode(user.twoFactorSecret, code))
+      throw new HttpError(401, "invalid two-factor code");
 
     const backupCodes = generateBackupCodes();
-    await this.twoFactor.saveBackupCodes(idBig, backupCodes.map((c) => c.hash));
-    await this.db.update(users).set({ twoFactorEnabled: true }).where(eq(users.id, idBig));
-    await this.sessions.appendAuditEvent({ type: "two_factor_enabled", userId });
+    await this.twoFactor.saveBackupCodes(
+      idBig,
+      backupCodes.map((c) => c.hash),
+    );
+    await this.db
+      .update(users)
+      .set({ twoFactorEnabled: true })
+      .where(eq(users.id, idBig));
+    await this.sessions.appendAuditEvent({
+      type: "two_factor_enabled",
+      userId,
+    });
     return { backupCodes: backupCodes.map((c) => c.code) };
   }
 
   async disableTwoFactor(userId: string, code: string): Promise<void> {
     const idBig = toId(userId);
     const user = await this.getUserOrThrow(userId);
-    if (!user.twoFactorEnabled || !user.twoFactorSecret) throw new HttpError(400, "two-factor is not enabled");
+    if (!user.twoFactorEnabled || !user.twoFactorSecret)
+      throw new HttpError(400, "two-factor is not enabled");
 
     const validTotp = verifyTotpCode(user.twoFactorSecret, code);
-    const validBackup = !validTotp && (await this.twoFactor.consumeBackupCode(idBig, code));
-    if (!validTotp && !validBackup) throw new HttpError(401, "invalid two-factor code");
+    const validBackup =
+      !validTotp && (await this.twoFactor.consumeBackupCode(idBig, code));
+    if (!validTotp && !validBackup)
+      throw new HttpError(401, "invalid two-factor code");
 
-    await this.db.update(users).set({ twoFactorEnabled: false, twoFactorSecret: null }).where(eq(users.id, idBig));
+    await this.db
+      .update(users)
+      .set({ twoFactorEnabled: false, twoFactorSecret: null })
+      .where(eq(users.id, idBig));
     await this.twoFactor.clearBackupCodes(idBig);
-    await this.sessions.appendAuditEvent({ type: "two_factor_disabled", userId });
+    await this.sessions.appendAuditEvent({
+      type: "two_factor_disabled",
+      userId,
+    });
   }
 
   /** Always succeeds from the caller's point of view — an unknown email or a throttled request looks identical, to avoid enumeration. */
   async requestPasswordReset(email: string): Promise<void> {
-    const [user] = await this.db.select().from(users).where(eq(users.email, email)).limit(1);
+    const [user] = await this.db
+      .select()
+      .from(users)
+      .where(eq(users.email, email))
+      .limit(1);
     if (!user || user.isDeleted) return;
 
-    const { allowed } = await checkRateLimit(this.rateLimit, "password-reset", email);
+    const { allowed } = await checkRateLimit(
+      this.rateLimit,
+      "password-reset",
+      email,
+    );
     if (!allowed) return;
 
-    const { token } = await coreRequestPasswordReset(this.passwordReset, user.id.toString());
-    if (this.config.sendPasswordResetEmail) await this.config.sendPasswordResetEmail(email, token);
+    const { token } = await coreRequestPasswordReset(
+      this.passwordReset,
+      user.id.toString(),
+    );
+    if (this.config.sendPasswordResetEmail)
+      await this.config.sendPasswordResetEmail(email, token);
   }
 
   async resetPassword(token: string, newPassword: string): Promise<void> {
-    const { userId } = await coreResetPassword(this.passwordReset, token, newPassword);
+    const { userId } = await coreResetPassword(
+      this.passwordReset,
+      token,
+      newPassword,
+    );
     // The old password is no longer trusted, so neither are its sessions. The revoker is the user
     // themselves — they proved control of the account by consuming the reset token.
     await revokeAllSessionsForUser(this.sessions, userId, { userId });
@@ -213,22 +358,40 @@ export class AuthService {
 
   /** Builds the redirect URL for `provider`. `state` is an opaque anti-CSRF nonce the provider echoes back verbatim. */
   async startOAuth(provider: string): Promise<{ url: string }> {
-    const state = Buffer.from(JSON.stringify({ nonce: randomUUID() })).toString("base64url");
+    const state = Buffer.from(JSON.stringify({ nonce: randomUUID() })).toString(
+      "base64url",
+    );
 
     if (provider === "google") {
       const creds = this.config.oauthProviders.google;
       if (!creds) throw new HttpError(400, "google OAuth is not configured");
-      return { url: buildAuthorizationUrl(GOOGLE_OIDC_PROVIDER, { clientId: creds.clientId, redirectUri: creds.redirectUri, state }) };
+      return {
+        url: buildAuthorizationUrl(GOOGLE_OIDC_PROVIDER, {
+          clientId: creds.clientId,
+          redirectUri: creds.redirectUri,
+          state,
+        }),
+      };
     }
     if (provider === "apple") {
       const creds = this.config.oauthProviders.apple;
       if (!creds) throw new HttpError(400, "apple OAuth is not configured");
-      return { url: buildAuthorizationUrl(APPLE_OIDC_PROVIDER, { clientId: creds.clientId, redirectUri: creds.redirectUri, state }) };
+      return {
+        url: buildAuthorizationUrl(APPLE_OIDC_PROVIDER, {
+          clientId: creds.clientId,
+          redirectUri: creds.redirectUri,
+          state,
+        }),
+      };
     }
     throw new HttpError(400, `unknown OAuth provider "${provider}"`);
   }
 
-  async completeOAuthCallback(provider: string, code: string, _state: string): Promise<AuthTokens> {
+  async completeOAuthCallback(
+    provider: string,
+    code: string,
+    _state: string,
+  ): Promise<AuthTokens> {
     let providerDescriptor: OAuthProviderDescriptor;
     let clientId: string;
     let idToken: string;
@@ -239,50 +402,100 @@ export class AuthService {
       providerDescriptor = GOOGLE_OIDC_PROVIDER;
       clientId = creds.clientId;
       idToken = (
-        await exchangeCodeForTokens(GOOGLE_OIDC_PROVIDER, { clientId: creds.clientId, clientSecret: creds.clientSecret, redirectUri: creds.redirectUri, code })
+        await exchangeCodeForTokens(GOOGLE_OIDC_PROVIDER, {
+          clientId: creds.clientId,
+          clientSecret: creds.clientSecret,
+          redirectUri: creds.redirectUri,
+          code,
+        })
       ).idToken;
     } else if (provider === "apple") {
       const creds = this.config.oauthProviders.apple;
       if (!creds) throw new HttpError(400, "apple OAuth is not configured");
       providerDescriptor = APPLE_OIDC_PROVIDER;
       clientId = creds.clientId;
-      const clientSecret = await signAppleClientSecret({ teamId: creds.teamId, clientId: creds.clientId, keyId: creds.keyId, privateKeyPem: creds.privateKey });
-      idToken = (await exchangeCodeForTokens(APPLE_OIDC_PROVIDER, { clientId: creds.clientId, clientSecret, redirectUri: creds.redirectUri, code })).idToken;
+      const clientSecret = await signAppleClientSecret({
+        teamId: creds.teamId,
+        clientId: creds.clientId,
+        keyId: creds.keyId,
+        privateKeyPem: creds.privateKey,
+      });
+      idToken = (
+        await exchangeCodeForTokens(APPLE_OIDC_PROVIDER, {
+          clientId: creds.clientId,
+          clientSecret,
+          redirectUri: creds.redirectUri,
+          code,
+        })
+      ).idToken;
     } else {
       throw new HttpError(400, `unknown OAuth provider "${provider}"`);
     }
 
-    const profile = await verifyIdTokenAndExtractProfile(providerDescriptor, { clientId, idToken });
-    const { userId } = await completeOAuthLogin(this.oauth, { provider, profile });
+    const profile = await verifyIdTokenAndExtractProfile(providerDescriptor, {
+      clientId,
+      idToken,
+    });
+    const { userId } = await completeOAuthLogin(this.oauth, {
+      provider,
+      profile,
+    });
 
     const user = await this.getUserOrThrow(userId);
-    if (user.blocked || !user.isActive || user.isDeleted) throw new HttpError(401, "account is blocked");
+    if (user.blocked || !user.isActive || user.isDeleted)
+      throw new HttpError(401, "account is blocked");
     // A user this login just created holds no roles at all; give them the defaults. Guarded on
     // "holds none" rather than "was created", so it can never re-add a role an administrator
     // revoked from someone who has been logging in for months.
-    if (!(await this.rbac.hasAnyRole(user.id))) await this.rbac.assignDefaultRoles(user.id);
+    if (!(await this.rbac.hasAnyRole(user.id)))
+      await this.rbac.assignDefaultRoles(user.id);
     return this.issueSessionTokens(user, { provider });
   }
 
-  async listAuditLog(filter: AuditLogListFilter): Promise<Paginated<AuditLogEntry>> {
+  async listAuditLog(
+    filter: AuditLogListFilter,
+  ): Promise<Paginated<AuditLogEntry>> {
     const { items, meta } = await this.auditLog.list(filter);
     return { items: items.map(toAuditLogEntry), meta };
   }
 
   /** `req.auth` (the JWT claims) never carries 2FA status, so `/auth/me` fetches it fresh — the one bit of the response that isn't just echoing the token. */
-  async getTwoFactorStatus(userId: string): Promise<{ twoFactorEnabled: boolean }> {
-    const [user] = await this.db.select({ twoFactorEnabled: users.twoFactorEnabled }).from(users).where(eq(users.id, toId(userId))).limit(1);
+  async getTwoFactorStatus(
+    userId: string,
+  ): Promise<{ twoFactorEnabled: boolean }> {
+    const [user] = await this.db
+      .select({ twoFactorEnabled: users.twoFactorEnabled })
+      .from(users)
+      .where(eq(users.id, toId(userId)))
+      .limit(1);
     if (!user) throw new HttpError(404, `user "${userId}" not found`);
     return { twoFactorEnabled: user.twoFactorEnabled };
   }
 
-  async listActiveSessions(userId: string): Promise<Array<{ id: string; createdAt: string; expiresAt: string; provider?: string; userAgent?: string; ip?: string }>> {
+  async listActiveSessions(
+    userId: string,
+  ): Promise<
+    Array<{
+      id: string;
+      createdAt: string;
+      expiresAt: string;
+      provider?: string;
+      userAgent?: string;
+      ip?: string;
+    }>
+  > {
     // "Active" is now two conditions, not one: not revoked, and not past its own absolute expiry.
     // `sessions_user_active_idx` is (user_id, is_revoked, expires_at) for exactly this read.
     const rows = await this.db
       .select()
       .from(sessions)
-      .where(and(eq(sessions.userId, toId(userId)), eq(sessions.isRevoked, false), gt(sessions.expiresAt, new Date())))
+      .where(
+        and(
+          eq(sessions.userId, toId(userId)),
+          eq(sessions.isRevoked, false),
+          gt(sessions.expiresAt, new Date()),
+        ),
+      )
       .orderBy(desc(sessions.createdAt));
     return rows.map((row) => ({
       id: row.id.toString(),
@@ -323,13 +536,24 @@ export class AuthService {
 
   async updateUser(
     userId: string,
-    input: { firstName?: string | null; lastName?: string | null; displayName?: string | null; phone?: string | null; username?: string | null; photo?: string | null },
+    input: {
+      firstName?: string | null;
+      lastName?: string | null;
+      displayName?: string | null;
+      phone?: string | null;
+      username?: string | null;
+      photo?: string | null;
+    },
     actorUserId: string | null,
   ): Promise<UserSummary> {
     return this.rbac.updateUser(userId, input, actorUserId);
   }
 
-  async deleteUser(userId: string, actorUserId: string | null, reason?: string): Promise<void> {
+  async deleteUser(
+    userId: string,
+    actorUserId: string | null,
+    reason?: string,
+  ): Promise<void> {
     await this.rbac.deleteUser(userId, actorUserId, reason);
   }
 
@@ -339,7 +563,10 @@ export class AuthService {
   }
 
   /** Defines a permission, or edits one — including deactivating it. The write path for "the catalog is editable in the database". */
-  async definePermission(input: PermissionInput, actorUserId: string | null): Promise<PermissionSummary> {
+  async definePermission(
+    input: PermissionInput,
+    actorUserId: string | null,
+  ): Promise<PermissionSummary> {
     return this.rbac.upsertPermission(input, actorUserId);
   }
 
@@ -347,53 +574,108 @@ export class AuthService {
     return { roles: await this.rbac.listRoles() };
   }
 
-  async createRole(input: { slug: string; name?: string; displayName?: string; description?: string | null }, actorUserId: string | null): Promise<RoleSummary> {
+  async createRole(
+    input: {
+      slug: string;
+      name?: string;
+      displayName?: string;
+      description?: string | null;
+    },
+    actorUserId: string | null,
+  ): Promise<RoleSummary> {
     return this.rbac.createRole(input, actorUserId);
   }
 
   async updateRole(
     roleId: string,
-    input: { name?: string; displayName?: string; description?: string | null; isActive?: boolean },
+    input: {
+      name?: string;
+      displayName?: string;
+      description?: string | null;
+      isActive?: boolean;
+    },
     actorUserId: string | null,
   ): Promise<RoleSummary> {
     return this.rbac.updateRole(roleId, input, actorUserId);
   }
 
-  async deleteRole(roleId: string, actorUserId: string | null, reason?: string): Promise<void> {
+  async deleteRole(
+    roleId: string,
+    actorUserId: string | null,
+    reason?: string,
+  ): Promise<void> {
     await this.rbac.deleteRole(roleId, actorUserId, reason);
   }
 
-  async attachPermissionToRole(roleId: string, permissionSlug: string, actorUserId: string | null): Promise<void> {
+  async attachPermissionToRole(
+    roleId: string,
+    permissionSlug: string,
+    actorUserId: string | null,
+  ): Promise<void> {
     await this.rbac.attachPermissionToRole(roleId, permissionSlug, actorUserId);
   }
 
   async assignRole(userId: string, roleSlug: string): Promise<void> {
     await this.rbac.assignRoleToUser(userId, roleSlug);
-    await this.sessions.appendAuditEvent({ type: "role_assigned", userId, role: roleSlug });
+    await this.sessions.appendAuditEvent({
+      type: "role_assigned",
+      userId,
+      role: roleSlug,
+    });
   }
 
   async revokeRole(userId: string, roleSlug: string): Promise<void> {
     await this.rbac.revokeRoleFromUser(userId, roleSlug);
-    await this.sessions.appendAuditEvent({ type: "role_revoked", userId, role: roleSlug });
+    await this.sessions.appendAuditEvent({
+      type: "role_revoked",
+      userId,
+      role: roleSlug,
+    });
   }
 
-  async grantPermission(userId: string, permissionSlug: string, actorUserId: string | null): Promise<void> {
+  async grantPermission(
+    userId: string,
+    permissionSlug: string,
+    actorUserId: string | null,
+  ): Promise<void> {
     await this.rbac.grantPermissionToUser(userId, permissionSlug, actorUserId);
-    await this.sessions.appendAuditEvent({ type: "permission_granted", userId, permission: permissionSlug });
+    await this.sessions.appendAuditEvent({
+      type: "permission_granted",
+      userId,
+      permission: permissionSlug,
+    });
   }
 
-  async revokePermission(userId: string, permissionSlug: string): Promise<void> {
+  async revokePermission(
+    userId: string,
+    permissionSlug: string,
+  ): Promise<void> {
     await this.rbac.revokePermissionFromUser(userId, permissionSlug);
-    await this.sessions.appendAuditEvent({ type: "permission_revoked", userId, permission: permissionSlug });
+    await this.sessions.appendAuditEvent({
+      type: "permission_revoked",
+      userId,
+      permission: permissionSlug,
+    });
   }
 
   async refresh(refreshToken: string): Promise<Omit<AuthTokens, "sessionId">> {
     const key = await this.keys.getActiveKey();
-    const presented = await verifyRefreshToken({ secret: this.keys.secret }, refreshToken);
-    const { session, nextJti } = await rotateRefreshToken(this.sessions, presented);
+    const presented = await verifyRefreshToken(
+      { secret: this.keys.secret },
+      refreshToken,
+    );
+    const { session, nextJti } = await rotateRefreshToken(
+      this.sessions,
+      presented,
+    );
 
-    const [user] = await this.db.select().from(users).where(eq(users.id, toId(session.userId))).limit(1);
-    if (!user || user.blocked || !user.isActive || user.isDeleted) throw new HttpError(401, "invalid credentials");
+    const [user] = await this.db
+      .select()
+      .from(users)
+      .where(eq(users.id, toId(session.userId)))
+      .limit(1);
+    if (!user || user.blocked || !user.isActive || user.isDeleted)
+      throw new HttpError(401, "invalid credentials");
 
     // Identity only. Authorization is resolved from the database on every request (the authz middleware),
     // so a token issued before a grant is as authoritative as one issued after it.
@@ -404,38 +686,83 @@ export class AuthService {
     );
     const refresh = await signRefreshToken(
       { activeKey: key },
-      { sub: user.id.toString(), sessionId: session.id, sv: session.sessionVersion },
+      {
+        sub: user.id.toString(),
+        sessionId: session.id,
+        sv: session.sessionVersion,
+      },
       { jti: nextJti, ttlSeconds: this.config.refreshTokenTtlSeconds },
     );
     return { accessToken: access.token, refreshToken: refresh.token };
   }
 
-  async logout(sessionId: string, accessJti: string, accessRemainingTtlSeconds: number, revoker?: Revoker): Promise<void> {
+  async logout(
+    sessionId: string,
+    accessJti: string,
+    accessRemainingTtlSeconds: number,
+    revoker?: Revoker,
+  ): Promise<void> {
     await revokeSession(this.sessions, sessionId, revoker);
-    await revokeAccessToken(this.sessions, accessJti, accessRemainingTtlSeconds);
+    await revokeAccessToken(
+      this.sessions,
+      accessJti,
+      accessRemainingTtlSeconds,
+    );
   }
 
   async logoutAll(userId: string, revoker?: Revoker): Promise<void> {
     await revokeAllSessionsForUser(this.sessions, userId, revoker);
   }
 
-  async logoutOthers(userId: string, keepSessionId: string, revoker?: Revoker): Promise<void> {
-    await revokeOtherSessionsForUser(this.sessions, userId, keepSessionId, revoker);
+  async logoutOthers(
+    userId: string,
+    keepSessionId: string,
+    revoker?: Revoker,
+  ): Promise<void> {
+    await revokeOtherSessionsForUser(
+      this.sessions,
+      userId,
+      keepSessionId,
+      revoker,
+    );
   }
 
-  async changePassword(userId: string, currentSessionId: string, input: { currentPassword: string; newPassword: string }): Promise<void> {
+  async changePassword(
+    userId: string,
+    currentSessionId: string,
+    input: { currentPassword: string; newPassword: string },
+  ): Promise<void> {
     const idBig = toId(userId);
-    const [user] = await this.db.select().from(users).where(eq(users.id, idBig)).limit(1);
-    if (!user || user.blocked || !user.isActive || user.isDeleted || !user.passwordHash) throw new HttpError(401, "invalid credentials");
-
-    const valid = await verifyPassword(user.passwordHash, input.currentPassword);
+    const [user] = await this.db
+      .select()
+      .from(users)
+      .where(eq(users.id, idBig))
+      .limit(1);
+    if (
+      !user ||
+      user.blocked ||
+      !user.isActive ||
+      user.isDeleted ||
+      !user.passwordHash
+    )
+      throw new HttpError(401, "invalid credentials");
+
+    const valid = await verifyPassword(
+      user.passwordHash,
+      input.currentPassword,
+    );
     if (!valid) throw new HttpError(401, "invalid credentials");
 
     const passwordHash = await hashPassword(input.newPassword);
-    await this.db.update(users).set({ passwordHash, updatedBy: idBig }).where(eq(users.id, idBig));
+    await this.db
+      .update(users)
+      .set({ passwordHash, updatedBy: idBig })
+      .where(eq(users.id, idBig));
     // The old password is no longer trusted everywhere else it's signed in — but leave the
     // session making this very call alone, the same courtesy `logoutOthers` extends.
-    await revokeOtherSessionsForUser(this.sessions, userId, currentSessionId, { userId });
+    await revokeOtherSessionsForUser(this.sessions, userId, currentSessionId, {
+      userId,
+    });
   }
 
   /** Backs both `GET`- and `PATCH /auth/me` — roles/blocked/lastLogin are an admin's business, not this endpoint's. */
@@ -465,13 +792,25 @@ export class AuthService {
    */
   async updateProfile(
     userId: string,
-    input: { firstName?: string | null; lastName?: string | null; displayName?: string | null; phone?: string | null; username?: string | null; photo?: string | null },
+    input: {
+      firstName?: string | null;
+      lastName?: string | null;
+      displayName?: string | null;
+      phone?: string | null;
+      username?: string | null;
+      photo?: string | null;
+    },
   ): Promise<SelfProfile> {
-    return this.toSelfProfile(await this.rbac.updateUser(userId, input, userId));
+    return this.toSelfProfile(
+      await this.rbac.updateUser(userId, input, userId),
+    );
   }
 
   async block(userId: string, revoker?: Revoker): Promise<void> {
-    await this.db.update(users).set({ blocked: true, updatedBy: toIdOrNull(revoker?.userId) }).where(eq(users.id, toId(userId)));
+    await this.db
+      .update(users)
+      .set({ blocked: true, updatedBy: toIdOrNull(revoker?.userId) })
+      .where(eq(users.id, toId(userId)));
     // The administrator, not the blocked user, is what lands in `sessions.revoked_by`.
     await blockUser(this.sessions, userId, revoker);
     // Belt and braces. The block is enforced on the authentication path — login and refresh both
@@ -482,7 +821,10 @@ export class AuthService {
   }
 
   async unblock(userId: string, revoker?: Revoker): Promise<void> {
-    await this.db.update(users).set({ blocked: false, updatedBy: toIdOrNull(revoker?.userId) }).where(eq(users.id, toId(userId)));
+    await this.db
+      .update(users)
+      .set({ blocked: false, updatedBy: toIdOrNull(revoker?.userId) })
+      .where(eq(users.id, toId(userId)));
   }
 
   /**
@@ -490,17 +832,29 @@ export class AuthService {
    * security/moderation action. Both independently deny login; see the note on the `users` table.
    */
   async deactivate(userId: string, revoker?: Revoker): Promise<void> {
-    await this.db.update(users).set({ isActive: false, updatedBy: toIdOrNull(revoker?.userId) }).where(eq(users.id, toId(userId)));
+    await this.db
+      .update(users)
+      .set({ isActive: false, updatedBy: toIdOrNull(revoker?.userId) })
+      .where(eq(users.id, toId(userId)));
     await deactivateUser(this.sessions, userId, revoker);
     await this.rbac.invalidateUser(userId);
   }
 
   async activate(userId: string, revoker?: Revoker): Promise<void> {
-    await this.db.update(users).set({ isActive: true, updatedBy: toIdOrNull(revoker?.userId) }).where(eq(users.id, toId(userId)));
+    await this.db
+      .update(users)
+      .set({ isActive: true, updatedBy: toIdOrNull(revoker?.userId) })
+      .where(eq(users.id, toId(userId)));
   }
 
-  private async getUserOrThrow(userId: string): Promise<typeof users.$inferSelect> {
-    const [user] = await this.db.select().from(users).where(eq(users.id, toId(userId))).limit(1);
+  private async getUserOrThrow(
+    userId: string,
+  ): Promise<typeof users.$inferSelect> {
+    const [user] = await this.db
+      .select()
+      .from(users)
+      .where(eq(users.id, toId(userId)))
+      .limit(1);
     if (!user) throw new HttpError(404, `user "${userId}" not found`);
     return user;
   }
@@ -508,8 +862,14 @@ export class AuthService {
   /** The access token identifies the user and the session and carries no authorization at all
    * — see AuthzGuard. Takes the raw database user row (bigint id) — every call site already has
    * one in hand. */
-  private async issueSessionTokens(user: { id: bigint }, meta: { userAgent?: string; ip?: string; provider?: string }): Promise<AuthTokens> {
-    const session = await createSession(this.sessions, { userId: user.id.toString(), ...meta });
+  private async issueSessionTokens(
+    user: { id: bigint },
+    meta: { userAgent?: string; ip?: string; provider?: string },
+  ): Promise<AuthTokens> {
+    const session = await createSession(this.sessions, {
+      userId: user.id.toString(),
+      ...meta,
+    });
     const key = await this.keys.getActiveKey();
 
     const access = await signAccessToken(
@@ -519,10 +879,21 @@ export class AuthService {
     );
     const refresh = await signRefreshToken(
       { activeKey: key },
-      { sub: user.id.toString(), sessionId: session.id, sv: session.sessionVersion },
-      { jti: session.currentRefreshJti, ttlSeconds: this.config.refreshTokenTtlSeconds },
+      {
+        sub: user.id.toString(),
+        sessionId: session.id,
+        sv: session.sessionVersion,
+      },
+      {
+        jti: session.currentRefreshJti,
+        ttlSeconds: this.config.refreshTokenTtlSeconds,
+      },
     );
 
-    return { accessToken: access.token, refreshToken: refresh.token, sessionId: session.id };
+    return {
+      accessToken: access.token,
+      refreshToken: refresh.token,
+      sessionId: session.id,
+    };
   }
 }