@cairs-npm/express-auth-2fa 0.1.2 → 0.1.4

package/dist/index.d.cts

@@ -208,6 +208,17 @@ declare const configSchema: z.ZodObject<{
         username: string;
         type?: string;
     }) => boolean | Promise<boolean>>]>>;
+    /**
+     * 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.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodType<(input: {
+        userId: string;
+    }) => boolean | Promise<boolean>, z.ZodTypeDef, (input: {
+        userId: string;
+    }) => boolean | Promise<boolean>>]>>;
     /** 2-Step Verification state for users who have not chosen one yet. */
     twoStepDefault: z.ZodDefault<z.ZodBoolean>;
     limits: z.ZodDefault<z.ZodObject<{
@@ -333,6 +344,9 @@ declare const configSchema: z.ZodObject<{
         username: string;
         type?: string;
     }) => boolean | Promise<boolean>);
+    twoStepEnabled: boolean | ((input: {
+        userId: string;
+    }) => boolean | Promise<boolean>);
     twoStepDefault: boolean;
     limits: {
         loginMaxAttempts: number;
@@ -402,6 +416,9 @@ declare const configSchema: z.ZodObject<{
         username: string;
         type?: string;
     }) => boolean | Promise<boolean>) | undefined;
+    twoStepEnabled?: boolean | ((input: {
+        userId: string;
+    }) => boolean | Promise<boolean>) | undefined;
     twoStepDefault?: boolean | undefined;
     limits?: {
         loginMaxAttempts?: number | undefined;

package/dist/index.d.ts

@@ -208,6 +208,17 @@ declare const configSchema: z.ZodObject<{
         username: string;
         type?: string;
     }) => boolean | Promise<boolean>>]>>;
+    /**
+     * 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.ZodDefault<z.ZodUnion<[z.ZodBoolean, z.ZodType<(input: {
+        userId: string;
+    }) => boolean | Promise<boolean>, z.ZodTypeDef, (input: {
+        userId: string;
+    }) => boolean | Promise<boolean>>]>>;
     /** 2-Step Verification state for users who have not chosen one yet. */
     twoStepDefault: z.ZodDefault<z.ZodBoolean>;
     limits: z.ZodDefault<z.ZodObject<{
@@ -333,6 +344,9 @@ declare const configSchema: z.ZodObject<{
         username: string;
         type?: string;
     }) => boolean | Promise<boolean>);
+    twoStepEnabled: boolean | ((input: {
+        userId: string;
+    }) => boolean | Promise<boolean>);
     twoStepDefault: boolean;
     limits: {
         loginMaxAttempts: number;
@@ -402,6 +416,9 @@ declare const configSchema: z.ZodObject<{
         username: string;
         type?: string;
     }) => boolean | Promise<boolean>) | undefined;
+    twoStepEnabled?: boolean | ((input: {
+        userId: string;
+    }) => boolean | Promise<boolean>) | undefined;
     twoStepDefault?: boolean | undefined;
     limits?: {
         loginMaxAttempts?: number | undefined;

package/dist/index.js

@@ -99,6 +99,16 @@ var configSchema = z.object({
       (v) => typeof v === "function"
     )
   ]).default(false),
+  /**
+   * 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.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({}),
@@ -299,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 {
@@ -555,11 +571,16 @@ 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);
-    return { twoStepEnabled: cred?.twoStepEnabled ?? this.config.twoStepDefault, methods };
+    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 && !await twoStepAvailableFor(this.config, userId)) {
+      throw apiError(409, "VALIDATION_ERROR", "2-Step Verification is turned off for this application.");
+    }
     if (enabled) {
       await ensureEmailMethod(this.config, this.cols, userId);
       const count = await this.cols.methods.countDocuments({ userId, status: "active" });
@@ -799,8 +820,9 @@ var AuthService = class {
       throw apiError(423, "LOCKED", "Too many attempts. Try again later.", { retryAt: cred.lockedUntil });
     }
     await this.resetFailedLogins(cred, now);
-    const trustedOk = cred.twoStepEnabled && await this.checkTrustedDevice(req, user.id);
-    if (!cred.twoStepEnabled || trustedOk) {
+    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);
       return this.authenticate(user.id, req, res, ["pwd"], { rememberMe: input.rememberMe });
     }