@shipfox/api-auth 18.0.0 → 20.0.0

package/src/presentation/routes/administration.test.ts

@@ -1,9 +1,9 @@
 import {impersonateResponseSchema} from '@shipfox/api-auth-dto';
 import {ADMINISTRATION_ACTION_PERFORMED} from '@shipfox/api-common-dto';
 import {userAccessTokenKey} from '@shipfox/node-auth-root-key';
+import type {AppConfig, FastifyInstance} from '@shipfox/node-fastify';
 import {hashOpaqueToken} from '@shipfox/node-tokens';
 import {asc, eq, sql} from 'drizzle-orm';
-import type {FastifyInstance} from 'fastify';
 import {signUserToken, verifyUserToken} from '#core/jwt.js';
 import {type AuthRateLimitAction, hashAuthRateLimitIdentifier} from '#core/rate-limit.js';
 import {db} from '#db/db.js';
@@ -78,14 +78,48 @@ async function seedExhaustedIpBucket(params: {
     });
 }
 
+type LoggerInstance = NonNullable<NonNullable<AppConfig['fastifyOptions']>['loggerInstance']>;
+
+interface CapturedLog {
+  level: string;
+  args: unknown[];
+}
+
+function createCapturingLogger(logs: CapturedLog[]): LoggerInstance {
+  const logger = {
+    child: () => logger,
+    level: 'info',
+    silent: (...args: unknown[]) => logs.push({level: 'silent', args}),
+    fatal: (...args: unknown[]) => logs.push({level: 'fatal', args}),
+    error: (...args: unknown[]) => logs.push({level: 'error', args}),
+    warn: (...args: unknown[]) => logs.push({level: 'warn', args}),
+    info: (...args: unknown[]) => logs.push({level: 'info', args}),
+    debug: (...args: unknown[]) => logs.push({level: 'debug', args}),
+    trace: (...args: unknown[]) => logs.push({level: 'trace', args}),
+  };
+  return logger as unknown as LoggerInstance;
+}
+
+function directoryLogContexts(logs: CapturedLog[]): unknown[] {
+  return logs
+    .filter(
+      ({level, args}) => level === 'info' && args[1] === 'Listed administrator user directory',
+    )
+    .map(({args}) => args[0]);
+}
+
 describe('Auth administration routes', () => {
   let app: FastifyInstance;
+  const directoryLogs: CapturedLog[] = [];
 
   beforeAll(async () => {
-    app = await createAuthTestApp();
+    app = await createAuthTestApp({
+      fastifyOptions: {loggerInstance: createCapturingLogger(directoryLogs)},
+    });
   });
 
   beforeEach(async () => {
+    directoryLogs.length = 0;
     resetCapturedMail();
     setImpersonationEnabled(true);
     setAuthJwtExpiresIn('15m');
@@ -273,6 +307,12 @@ describe('Auth administration routes', () => {
     });
 
     expect(response.statusCode).toBe(404);
+
+    const directoryResponse = await app.inject({
+      method: 'GET',
+      url: '/admin/v1/auth/users/directory',
+    });
+    expect(directoryResponse.statusCode).toBe(404);
   });
 
   test('rejects an invalid bootstrap token without writing a grant or event', async () => {
@@ -514,6 +554,323 @@ describe('Auth administration routes', () => {
     expect(byEmail.json().email).toBe(observer.email);
   });
 
+  test('lists safe user summaries for owners, operators, and observers with cursor pagination', async () => {
+    const marker = `admin-user-directory-${crypto.randomUUID()}`;
+    const owner = await createVerifiedSession(`${marker}-owner`);
+    const operator = await createVerifiedSession(`${marker}-operator`);
+    const observer = await createVerifiedSession(`${marker}-observer`);
+    const target = await createVerifiedSession(`${marker}-target`);
+    const eligibilityMarker = `admin-user-directory-eligibility-${crypto.randomUUID()}`;
+    const eligibleTarget = await createVerifiedSession(`${eligibilityMarker}-eligible`);
+    const ineligibleTarget = await createVerifiedSession(`${eligibilityMarker}-ineligible`);
+    await db()
+      .update(users)
+      .set({status: 'suspended'})
+      .where(eq(users.id, ineligibleTarget.userId));
+
+    const bootstrap = await app.inject({
+      method: 'POST',
+      url: '/admin/auth/admin-grants/bootstrap',
+      headers: authHeaders(owner.token, 'directory-bootstrap'),
+      payload: {bootstrap_token: BOOTSTRAP_TOKEN},
+    });
+    expect(bootstrap.statusCode).toBe(201);
+
+    const observerGrant = await app.inject({
+      method: 'POST',
+      url: '/admin/auth/admin-grants',
+      headers: authHeaders(owner.token, 'directory-observer-grant'),
+      payload: {
+        user_id: observer.userId,
+        role: 'admin-observer',
+        reason: 'Directory read access',
+      },
+    });
+    expect(observerGrant.statusCode).toBe(201);
+
+    const operatorGrant = await app.inject({
+      method: 'POST',
+      url: '/admin/auth/admin-grants',
+      headers: authHeaders(owner.token, 'directory-operator-grant'),
+      payload: {
+        user_id: operator.userId,
+        role: 'admin-operator',
+        reason: 'Directory read access',
+      },
+    });
+    expect(operatorGrant.statusCode).toBe(201);
+
+    const firstPage = await app.inject({
+      method: 'GET',
+      url: `/admin/auth/users/directory?search=${encodeURIComponent(` ${marker}   `)}&limit=2`,
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(firstPage.statusCode).toBe(200);
+    expect(firstPage.json().users).toHaveLength(2);
+    expect(firstPage.json().next_cursor).toEqual(expect.any(String));
+    const firstPageLog = directoryLogContexts(directoryLogs).at(-1);
+    expect(firstPageLog).toMatchObject({
+      actorId: observer.userId,
+      requiredRole: 'admin-observer',
+      targetType: 'user-directory',
+      requestId: expect.any(String),
+      result: 'succeeded',
+      outcome: 'succeeded',
+      durationMs: expect.any(Number),
+      resultCountBucket: '1-10',
+      filterPresence: {search: true, status: false, impersonationEligible: false},
+      nextPagePresent: true,
+    });
+    expect(JSON.stringify(firstPageLog)).not.toContain(marker);
+    expect(JSON.stringify(firstPageLog)).not.toContain(firstPage.json().next_cursor);
+
+    const secondPage = await app.inject({
+      method: 'GET',
+      url: `/admin/auth/users/directory?search=${encodeURIComponent(marker)}&limit=2&cursor=${encodeURIComponent(firstPage.json().next_cursor)}`,
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(secondPage.statusCode).toBe(200);
+    expect(secondPage.json().users).toHaveLength(2);
+    expect(secondPage.json().next_cursor).toBeNull();
+
+    const listedUsers = [...firstPage.json().users, ...secondPage.json().users];
+    expect(new Set(listedUsers.map((user: {id: string}) => user.id)).size).toBe(4);
+    expect(listedUsers).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          id: owner.userId,
+          email: owner.email,
+          name: `${marker}-owner`,
+          status: 'active',
+          admin_role: 'admin-owner',
+        }),
+        expect.objectContaining({
+          id: operator.userId,
+          email: operator.email,
+          name: `${marker}-operator`,
+          status: 'active',
+          admin_role: 'admin-operator',
+        }),
+        expect.objectContaining({
+          id: observer.userId,
+          email: observer.email,
+          name: `${marker}-observer`,
+          status: 'active',
+          admin_role: 'admin-observer',
+        }),
+        expect.objectContaining({
+          id: target.userId,
+          email: target.email,
+          name: `${marker}-target`,
+          status: 'active',
+          admin_role: null,
+        }),
+      ]),
+    );
+    for (const user of listedUsers) {
+      expect(user).not.toHaveProperty('hashed_password');
+      expect(user).not.toHaveProperty('sessions');
+      expect(user).not.toHaveProperty('provider_payload');
+    }
+
+    const eligibleUsers = await app.inject({
+      method: 'GET',
+      url: `/admin/auth/users/directory?search=${encodeURIComponent(marker)}&status=active&impersonation_eligible=true`,
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(eligibleUsers.statusCode).toBe(200);
+    expect(eligibleUsers.json().users).toEqual([
+      expect.objectContaining({id: target.userId, admin_role: null}),
+    ]);
+    expect(eligibleUsers.json().next_cursor).toBeNull();
+
+    const ineligibleUsers = await app.inject({
+      method: 'GET',
+      url: `/admin/auth/users/directory?search=${encodeURIComponent(eligibilityMarker)}&impersonation_eligible=false`,
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(ineligibleUsers.statusCode).toBe(200);
+    expect(ineligibleUsers.json().users).toEqual([
+      expect.objectContaining({id: ineligibleTarget.userId, status: 'suspended'}),
+    ]);
+    expect(ineligibleUsers.json().users).not.toEqual(
+      expect.arrayContaining([expect.objectContaining({id: eligibleTarget.userId})]),
+    );
+    expect(ineligibleUsers.json().next_cursor).toBeNull();
+
+    const emptyPage = await app.inject({
+      method: 'GET',
+      url: `/admin/auth/users/directory?search=${encodeURIComponent(`missing-${marker}`)}`,
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(emptyPage.statusCode).toBe(200);
+    expect(emptyPage.json()).toEqual({users: [], next_cursor: null});
+
+    for (const actor of [owner, operator]) {
+      const response = await app.inject({
+        method: 'GET',
+        url: `/admin/auth/users/directory?search=${encodeURIComponent(marker)}&limit=100`,
+        headers: {authorization: `Bearer ${actor.token}`},
+      });
+      expect(response.statusCode).toBe(200);
+      expect(response.json().users).toHaveLength(4);
+    }
+
+    const observerActionEvents = await db()
+      .select()
+      .from(authOutbox)
+      .where(sql`${authOutbox.payload}->>'actorId' = ${observer.userId}`);
+    expect(observerActionEvents).toHaveLength(0);
+  });
+
+  test('translates directory filter errors and rejects ordinary, suspended, and impersonated sessions', async () => {
+    const marker = `admin-user-directory-authz-${crypto.randomUUID()}`;
+    const owner = await createVerifiedSession(`${marker}-owner`);
+    const observer = await createVerifiedSession(`${marker}-observer`);
+    const ordinary = await createVerifiedSession(`${marker}-ordinary`);
+    const suspended = await createVerifiedSession(`${marker}-suspended`);
+
+    const bootstrap = await app.inject({
+      method: 'POST',
+      url: '/admin/auth/admin-grants/bootstrap',
+      headers: authHeaders(owner.token, 'directory-authz-bootstrap'),
+      payload: {bootstrap_token: BOOTSTRAP_TOKEN},
+    });
+    expect(bootstrap.statusCode).toBe(201);
+
+    for (const [userId, role, idempotencyKey] of [
+      [observer.userId, 'admin-observer', 'directory-authz-observer-grant'],
+      [suspended.userId, 'admin-observer', 'directory-authz-suspended-grant'],
+    ] as const) {
+      const grant = await app.inject({
+        method: 'POST',
+        url: '/admin/auth/admin-grants',
+        headers: authHeaders(owner.token, idempotencyKey),
+        payload: {user_id: userId, role, reason: 'Directory read access'},
+      });
+      expect(grant.statusCode).toBe(201);
+    }
+    await db().update(users).set({status: 'suspended'}).where(eq(users.id, suspended.userId));
+
+    const ordinaryResponse = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory',
+      headers: {authorization: `Bearer ${ordinary.token}`},
+    });
+    expect(ordinaryResponse.statusCode).toBe(403);
+    expect(ordinaryResponse.json()).toEqual({
+      code: 'forbidden',
+      details: {required_role: 'admin-observer'},
+    });
+
+    const suspendedResponse = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory',
+      headers: {authorization: `Bearer ${suspended.token}`},
+    });
+    expect(suspendedResponse.statusCode).toBe(403);
+    expect(suspendedResponse.json().code).toBe('forbidden');
+
+    const impersonatedResponse = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory',
+      headers: {authorization: `Bearer ${await impersonatedToken(owner.userId, owner.email)}`},
+    });
+    expect(impersonatedResponse.statusCode).toBe(403);
+    expect(impersonatedResponse.json()).toEqual({code: 'admin-role-required'});
+
+    const invalidFilter = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory?status=suspended&impersonation_eligible=true',
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(invalidFilter.statusCode).toBe(400);
+    expect(invalidFilter.json().code).toBe('validation-error');
+
+    const invalidCursor = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory?cursor=not-a-real-cursor',
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(invalidCursor.statusCode).toBe(400);
+    expect(invalidCursor.json().code).toBe('invalid-cursor');
+  });
+
+  test('uses independent source-IP and actor buckets for directory reads', async () => {
+    const owner = await createVerifiedSession('admin-directory-rate-limit-owner');
+    const observer = await createVerifiedSession('admin-directory-rate-limit-observer');
+
+    const bootstrap = await app.inject({
+      method: 'POST',
+      url: '/admin/auth/admin-grants/bootstrap',
+      headers: authHeaders(owner.token, 'directory-rate-limit-bootstrap'),
+      payload: {bootstrap_token: BOOTSTRAP_TOKEN},
+    });
+    expect(bootstrap.statusCode).toBe(201);
+
+    const grant = await app.inject({
+      method: 'POST',
+      url: '/admin/auth/admin-grants',
+      headers: authHeaders(owner.token, 'directory-rate-limit-grant'),
+      payload: {
+        user_id: observer.userId,
+        role: 'admin-observer',
+        reason: 'Directory read access',
+      },
+    });
+    expect(grant.statusCode).toBe(201);
+
+    await seedExhaustedIpBucket({
+      action: 'directory',
+      identifier: '127.0.0.1',
+      limit: 60,
+      windowSeconds: 5 * 60,
+    });
+    const ipBlocked = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory',
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(ipBlocked.statusCode).toBe(429);
+    expect(ipBlocked.json().code).toBe('rate-limited');
+
+    await seedExhaustedIpBucket({
+      action: 'directory',
+      scope: 'actor',
+      identifier: observer.userId,
+      limit: 60,
+      windowSeconds: 5 * 60,
+    });
+    const actorBlocked = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory',
+      remoteAddress: '10.0.0.2',
+      headers: {authorization: `Bearer ${observer.token}`},
+    });
+    expect(actorBlocked.statusCode).toBe(429);
+    expect(actorBlocked.json().code).toBe('rate-limited');
+  });
+
+  test('rate-limits directory requests before checking the observer role', async () => {
+    const ordinary = await createVerifiedSession('admin-directory-rate-limit-ordinary');
+
+    await seedExhaustedIpBucket({
+      action: 'directory',
+      identifier: '127.0.0.1',
+      limit: 60,
+      windowSeconds: 5 * 60,
+    });
+
+    const response = await app.inject({
+      method: 'GET',
+      url: '/admin/auth/users/directory',
+      headers: {authorization: `Bearer ${ordinary.token}`},
+    });
+
+    expect(response.statusCode).toBe(429);
+    expect(response.json().code).toBe('rate-limited');
+  });
+
   test('bounds and deterministically paginates administrator grant summaries for observers', async () => {
     const owner = await createVerifiedSession('admin-summary-owner');
     const observer = await createVerifiedSession('admin-summary-observer');

package/src/presentation/routes/administration.ts

@@ -6,6 +6,8 @@ import {
 } from '@shipfox/api-auth-context';
 import {
   adminBootstrapStateSchema,
+  administratorUserDirectoryQuerySchema,
+  administratorUserDirectoryResponseSchema,
   administratorUserLookupQuerySchema,
   administratorUserMutationResponseSchema,
   administratorUserSummarySchema,
@@ -37,6 +39,7 @@ import {
   grantAdministratorRole,
   impersonateUser,
   listAdministratorGrantSummaries,
+  listAdministratorUsers,
   reactivateAdministratorUser,
   revokeAdministratorGrant,
   revokeAdministratorUserSessions,
@@ -60,6 +63,7 @@ import {
   ImpersonationExpiredError,
   ImpersonationTargetNotActiveError,
   InvalidAdminBootstrapTokenError,
+  InvalidAdministratorUserDirectoryFilterError,
   InvalidCredentialsError,
   LastAdminOwnerError,
   UserNotFoundError,
@@ -136,13 +140,77 @@ function toAdministratorUserMutationDto(result: {
   };
 }
 
+function directoryResultCountBucket(count: number): '0' | '1-10' | '11-50' | '51-100' {
+  if (count === 0) return '0';
+  if (count <= 10) return '1-10';
+  if (count <= 50) return '11-50';
+  return '51-100';
+}
+
+function logAdministratorUserDirectoryRead(params: {
+  request: FastifyRequest;
+  actorId: string;
+  outcome: 'succeeded' | 'failed';
+  durationMs: number;
+  resultCount: number;
+  filterPresence: {
+    search: boolean;
+    status: boolean;
+    impersonationEligible: boolean;
+  };
+  nextPagePresent: boolean;
+}): void {
+  try {
+    params.request.log.info(
+      {
+        actorId: params.actorId,
+        requiredRole: 'admin-observer',
+        targetType: 'user-directory',
+        requestId: params.request.id,
+        result: params.outcome,
+        outcome: params.outcome,
+        durationMs: params.durationMs,
+        resultCountBucket: directoryResultCountBucket(params.resultCount),
+        filterPresence: params.filterPresence,
+        nextPagePresent: params.nextPagePresent,
+      },
+      'Listed administrator user directory',
+    );
+  } catch {
+    // Logging must not change the directory read outcome.
+  }
+}
+
+function translateImpersonationEligibilityError(error: unknown): ClientError | undefined {
+  // The mint primitive re-checks login eligibility on the row it reads, and a
+  // concurrent suspension or unverification between the in-transaction ladder
+  // read and that read surfaces these errors. Map them to the same documented
+  // client error instead of a generic 500.
+  if (error instanceof EmailNotVerifiedError || error instanceof InvalidCredentialsError) {
+    return new ClientError('User cannot be impersonated', 'impersonation-target-not-active', {
+      status: 403,
+    });
+  }
+  if (error instanceof ImpersonationExpiredError) {
+    return new ClientError('Impersonation session has expired', 'impersonation-expired', {
+      status: 410,
+    });
+  }
+  return undefined;
+}
+
 function translateAdministrationError(error: unknown): never {
+  const impersonationEligibilityError = translateImpersonationEligibilityError(error);
+  if (impersonationEligibilityError) throw impersonationEligibilityError;
   if (error instanceof AdminRoleRequiredError) {
     throw new ClientError('Administrator role required', 'forbidden', {
       status: 403,
       details: {required_role: error.minimumRole},
     });
   }
+  if (error instanceof InvalidAdministratorUserDirectoryFilterError) {
+    throw new ClientError(error.message, 'validation-error', {status: 400});
+  }
   if (error instanceof InvalidAdminBootstrapTokenError) {
     throw new ClientError('Bootstrap token is invalid', 'bootstrap-token-invalid', {
       status: 403,
@@ -196,20 +264,6 @@ function translateAdministrationError(error: unknown): never {
       status: 403,
     });
   }
-  // The mint primitive re-checks login eligibility (active, verified) on the
-  // row it reads, and a concurrent suspension or unverification between the
-  // in-transaction ladder read and that read surfaces these errors. Map them
-  // to the same documented client error instead of a generic 500.
-  if (error instanceof EmailNotVerifiedError || error instanceof InvalidCredentialsError) {
-    throw new ClientError('User cannot be impersonated', 'impersonation-target-not-active', {
-      status: 403,
-    });
-  }
-  if (error instanceof ImpersonationExpiredError) {
-    throw new ClientError('Impersonation session has expired', 'impersonation-expired', {
-      status: 410,
-    });
-  }
   throw error;
 }
 
@@ -288,16 +342,78 @@ const userLookupRoute = defineRoute({
     const {id, user_id: userId, email} = request.query;
     const lookupId = id ?? userId;
     const actorId = requireActorId(request);
-    const user = lookupId
-      ? await findAdministratorUserSummary({actorId, id: lookupId})
-      : email
-        ? await findAdministratorUserSummary({actorId, email})
-        : undefined;
+    let user: Awaited<ReturnType<typeof findAdministratorUserSummary>>;
+    if (lookupId) user = await findAdministratorUserSummary({actorId, id: lookupId});
+    else if (email) user = await findAdministratorUserSummary({actorId, email});
     if (!user) throw new UserNotFoundError(lookupId ?? email ?? 'unknown');
     return toAdministratorUserSummaryDto(user);
   },
 });
 
+const userDirectoryRoute = defineRoute({
+  method: 'GET',
+  path: '/directory',
+  description: 'List bounded administrator-safe user summaries for directory browsing.',
+  schema: {
+    querystring: administratorUserDirectoryQuerySchema,
+    response: {200: administratorUserDirectoryResponseSchema},
+  },
+  preHandler: createAuthActorRateLimitPreHandler('directory'),
+  errorHandler: translateAdministrationError,
+  handler: async (request) => {
+    const actorId = requireActorId(request);
+    const startedAt = performance.now();
+    const {
+      search,
+      status,
+      impersonation_eligible: impersonationEligible,
+      limit,
+      cursor,
+    } = request.query;
+    let resultCount = 0;
+    let nextPagePresent = false;
+    let outcome: 'succeeded' | 'failed' = 'failed';
+
+    try {
+      const decodedCursor = decodeTimestampIdCursor(cursor);
+      if (cursor && !decodedCursor) {
+        throw new ClientError('Invalid cursor', 'invalid-cursor', {status: 400});
+      }
+
+      const result = await listAdministratorUsers({
+        actorId,
+        limit,
+        ...(decodedCursor ? {cursor: decodedCursor} : {}),
+        ...(search !== undefined ? {search} : {}),
+        ...(status !== undefined ? {status} : {}),
+        ...(impersonationEligible !== undefined ? {eligible: impersonationEligible} : {}),
+      });
+      resultCount = result.users.length;
+      nextPagePresent = result.nextCursor !== null;
+      outcome = 'succeeded';
+
+      return {
+        users: result.users.map(toAdministratorUserSummaryDto),
+        next_cursor: result.nextCursor ? encodeTimestampIdCursor(result.nextCursor) : null,
+      };
+    } finally {
+      logAdministratorUserDirectoryRead({
+        request,
+        actorId,
+        outcome,
+        durationMs: Math.round(performance.now() - startedAt),
+        resultCount,
+        filterPresence: {
+          search: search !== undefined,
+          status: status !== undefined,
+          impersonationEligible: impersonationEligible !== undefined,
+        },
+        nextPagePresent,
+      });
+    }
+  },
+});
+
 const suspendUserRoute = defineRoute({
   method: 'POST',
   path: '/:userId/suspend',
@@ -485,7 +601,13 @@ export function createAdministrationUserRoutes(
     adoptAdministrationActorGuard({
       prefix: '/admin/auth/users',
       auth: AUTH_USER,
-      routes: [userLookupRoute, suspendUserRoute, reactivateUserRoute, revokeUserSessionsRoute],
+      routes: [
+        userDirectoryRoute,
+        userLookupRoute,
+        suspendUserRoute,
+        reactivateUserRoute,
+        revokeUserSessionsRoute,
+      ],
     }),
     // The impersonate route mounts outside the adopted guard on purpose: its
     // limiter must run before the impersonated-session rejection (see

package/src/presentation/routes/email-verification/verify-email-resend.ts

@@ -4,6 +4,12 @@ import {ClientError, defineRoute} from '@shipfox/node-fastify';
 import {resendEmailVerification} from '#core/auth.js';
 import {createAuthRateLimitPreHandler} from '#presentation/routes/rate-limit.js';
 
+function emailChallengeStatus(code: EmailChallengeError['code']): 400 | 410 | 429 {
+  if (code === 'limited') return 429;
+  if (code === 'expired') return 410;
+  return 400;
+}
+
 export const verifyEmailResendRoute = defineRoute({
   method: 'POST',
   path: '/verify-email/resend',
@@ -18,7 +24,7 @@ export const verifyEmailResendRoute = defineRoute({
   errorHandler: (error) => {
     if (error instanceof EmailChallengeError) {
       throw new ClientError(error.message, `email-challenge-${error.code}`, {
-        status: error.code === 'limited' ? 429 : error.code === 'expired' ? 410 : 400,
+        status: emailChallengeStatus(error.code),
         ...(error.retryAt ? {details: {retry_at: error.retryAt.toISOString()}} : {}),
       });
     }