@cairs-npm/express-auth-2fa 0.1.3 → 0.1.5

package/dist/index.js

@@ -100,23 +100,27 @@ var configSchema = z.object({
     )
   ]).default(false),
   /**
-   * Project-wide 2-Step Verification switch. False: password sign-in never asks for a code
-   * (whatever each user chose) and the two-step setting can't be turned on. Passwordless
-   * sign-in still sends a code — it's the only factor there.
+   * 2-Step Verification switch above each user's own choice. False: password sign-in never
+   * asks for a code and the two-step setting can't be turned on. Passwordless sign-in still
+   * sends a code — it's the only factor there. Pass a function to decide per user, e.g. from
+   * an organization setting.
    */
-  twoStepEnabled: z.boolean().default(true),
+  twoStepEnabled: z.union([
+    z.boolean(),
+    z.custom((v) => typeof v === "function")
+  ]).default(true),
   /** 2-Step Verification state for users who have not chosen one yet. */
   twoStepDefault: z.boolean().default(false),
-  limits: limitSchema.default({}),
+  limits: limitSchema.prefault({}),
   /**
    * Set false to turn off every RATE_LIMITED check: the per-IP limits on login / code
    * verify / send / step-up and the code-send cooldown and caps. Account lockouts after
    * failed passwords or codes (LOCKED) still apply.
    */
   rateLimits: z.boolean().default(true),
-  argon2: argon2Schema.default({}),
-  cookies: cookieSchema.default({}),
-  ttl: ttlSchema.default({}),
+  argon2: argon2Schema.prefault({}),
+  cookies: cookieSchema.prefault({}),
+  ttl: ttlSchema.prefault({}),
   /** Serve GET /auth/openapi.json (A.7 docs). */
   exposeDocs: z.boolean().default(false)
 });
@@ -305,6 +309,12 @@ async function migrate(db, prefix = "auth_", auditDays = 365) {
   return c;
 }
 
+// src/config/twoStep.ts
+async function twoStepAvailableFor(config, userId) {
+  const v = config.twoStepEnabled;
+  return typeof v === "function" ? Boolean(await v({ userId })) : v;
+}
+
 // src/middleware/errors.ts
 import { ZodError } from "zod";
 var ApiErrorException = class extends Error {
@@ -561,14 +571,14 @@ var MethodService = class {
     const cred = await this.cols.credentials.findOne({ userId });
     const docs = await this.cols.methods.find({ userId, status: "active" }).toArray();
     const methods = docs.sort((a, b) => Number(b.isDefault) - Number(a.isDefault) || a.createdAt.getTime() - b.createdAt.getTime()).map(toApiMethod);
-    const available = this.config.twoStepEnabled;
+    const available = await twoStepAvailableFor(this.config, userId);
     const twoStepEnabled = available && (cred?.twoStepEnabled ?? this.config.twoStepDefault);
     return { twoStepEnabled, twoStepAvailable: available, methods };
   }
   /** BR-15 — enable needs ≥1 active method; disable needs step-up + revokes trusted devices. */
   async setTwoStep(userId, sid, enabled, stepUpToken) {
     const now = this.config.clock();
-    if (enabled && !this.config.twoStepEnabled) {
+    if (enabled && !await twoStepAvailableFor(this.config, userId)) {
       throw apiError(409, "VALIDATION_ERROR", "2-Step Verification is turned off for this application.");
     }
     if (enabled) {
@@ -810,7 +820,7 @@ var AuthService = class {
       throw apiError(423, "LOCKED", "Too many attempts. Try again later.", { retryAt: cred.lockedUntil });
     }
     await this.resetFailedLogins(cred, now);
-    const twoStep = this.config.twoStepEnabled && cred.twoStepEnabled;
+    const twoStep = cred.twoStepEnabled && await twoStepAvailableFor(this.config, user.id);
     const trustedOk = twoStep && await this.checkTrustedDevice(req, user.id);
     if (!twoStep || trustedOk) {
       await this.audit.record(user.id, "login_success", ctx);