@djangocfg/api 2.1.459 → 2.1.462

package/dist/auth.cjs

@@ -74,6 +74,7 @@ __export(auth_exports, {
   useTwoFactor: () => useTwoFactor,
   useTwoFactorSetup: () => useTwoFactorSetup,
   useTwoFactorStatus: () => useTwoFactorStatus,
+  useTwoFactorVerify: () => useTwoFactorVerify,
   validateEmail: () => validateEmail,
   validateIdentifier: () => validateIdentifier
 });
@@ -1149,7 +1150,7 @@ var useAutoAuth = /* @__PURE__ */ __name((options = {}) => {
   };
 }, "useAutoAuth");
 
-// src/auth/hooks/useTwoFactor.ts
+// src/auth/hooks/useTwoFactorVerify.ts
 var import_react8 = require("react");
 
 // src/_api/generated/core/bodySerializer.gen.ts
@@ -2677,8 +2678,35 @@ var useAuthRedirectManager = /* @__PURE__ */ __name((options = {}) => {
   };
 }, "useAuthRedirectManager");
 
-// src/auth/hooks/useTwoFactor.ts
-var useTwoFactor = /* @__PURE__ */ __name((options = {}) => {
+// src/auth/hooks/twoFactor.shared.ts
+var TOTP_CODE_LENGTH = 6;
+function extractTwoFactorError(err, fallback) {
+  if (err instanceof APIError) {
+    const body = err.response ?? null;
+    if (typeof body?.error === "string") return body.error;
+    if (typeof body?.detail === "string") return body.detail;
+    if (typeof body?.message === "string") return body.message;
+    return err.errorMessage ?? err.message;
+  }
+  if (err instanceof Error) return err.message;
+  return fallback;
+}
+__name(extractTwoFactorError, "extractTwoFactorError");
+function extractAttemptsRemaining(err) {
+  if (err instanceof APIError) {
+    const body = err.response ?? null;
+    if (typeof body?.attempts_remaining === "number") return body.attempts_remaining;
+  }
+  return null;
+}
+__name(extractAttemptsRemaining, "extractAttemptsRemaining");
+function isValidTotpCode(code) {
+  return !!code && code.length === TOTP_CODE_LENGTH;
+}
+__name(isValidTotpCode, "isValidTotpCode");
+
+// src/auth/hooks/useTwoFactorVerify.ts
+var useTwoFactorVerify = /* @__PURE__ */ __name((options = {}) => {
   const { onSuccess, onError, redirectUrl, skipRedirect = false } = options;
   const router = useCfgRouter();
   const [isLoading, setIsLoading] = (0, import_react8.useState)(false);
@@ -2718,7 +2746,7 @@ var useTwoFactor = /* @__PURE__ */ __name((options = {}) => {
       onError?.(msg);
       return false;
     }
-    if (!code || code.length !== 6) {
+    if (!isValidTotpCode(code)) {
       const msg = "Please enter a 6-digit code";
       setError(msg);
       onError?.(msg);
@@ -2740,10 +2768,9 @@ var useTwoFactor = /* @__PURE__ */ __name((options = {}) => {
       return true;
     } catch (err) {
       authLogger.error("2FA TOTP verification error:", err);
-      const errorMessage = err instanceof APIError ? err.response?.error || err.response?.detail || err.response?.message || err.errorMessage : err instanceof Error ? err.message : "Invalid verification code";
-      if (err instanceof APIError && typeof err.response?.attempts_remaining === "number") {
-        setAttemptsRemaining(err.response.attempts_remaining);
-      }
+      const errorMessage = extractTwoFactorError(err, "Invalid verification code");
+      const attempts = extractAttemptsRemaining(err);
+      if (attempts !== null) setAttemptsRemaining(attempts);
       setError(errorMessage);
       onError?.(errorMessage);
       Analytics.event("auth_otp_verify_fail" /* AUTH_OTP_VERIFY_FAIL */, {
@@ -2787,10 +2814,9 @@ var useTwoFactor = /* @__PURE__ */ __name((options = {}) => {
       return true;
     } catch (err) {
       authLogger.error("2FA backup code verification error:", err);
-      const errorMessage = err instanceof APIError ? err.response?.error || err.response?.detail || err.response?.message || err.errorMessage : err instanceof Error ? err.message : "Invalid backup code";
-      if (err instanceof APIError && typeof err.response?.attempts_remaining === "number") {
-        setAttemptsRemaining(err.response.attempts_remaining);
-      }
+      const errorMessage = extractTwoFactorError(err, "Invalid backup code");
+      const attempts = extractAttemptsRemaining(err);
+      if (attempts !== null) setAttemptsRemaining(attempts);
       setError(errorMessage);
       onError?.(errorMessage);
       Analytics.event("auth_otp_verify_fail" /* AUTH_OTP_VERIFY_FAIL */, {
@@ -2812,7 +2838,7 @@ var useTwoFactor = /* @__PURE__ */ __name((options = {}) => {
     verifyBackupCode,
     clearError
   };
-}, "useTwoFactor");
+}, "useTwoFactorVerify");
 
 // src/auth/hooks/useAuthForm.ts
 var useAuthForm = /* @__PURE__ */ __name((options) => {
@@ -2856,7 +2882,7 @@ var useAuthForm = /* @__PURE__ */ __name((options) => {
     startRateLimitCountdown,
     setWebmail
   } = formState;
-  const twoFactor = useTwoFactor({
+  const twoFactor = useTwoFactorVerify({
     onSuccess: /* @__PURE__ */ __name(() => {
       authLogger.info("2FA verification successful, showing success screen");
       setStep("success");
@@ -3247,7 +3273,7 @@ var useTwoFactorSetup = /* @__PURE__ */ __name((options = {}) => {
       authLogger.info("2FA setup initiated, expires in:", data.expiresIn, "seconds");
       return data;
     } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : "Failed to start 2FA setup";
+      const errorMessage = extractTwoFactorError(err, "Failed to start 2FA setup");
       authLogger.error("2FA setup error:", err);
       setError(errorMessage);
       setSetupStep("idle");
@@ -3264,7 +3290,7 @@ var useTwoFactorSetup = /* @__PURE__ */ __name((options = {}) => {
       onError?.(msg);
       return null;
     }
-    if (!code || code.length !== 6) {
+    if (!isValidTotpCode(code)) {
       const msg = "Please enter a 6-digit code";
       setError(msg);
       onError?.(msg);
@@ -3288,7 +3314,7 @@ var useTwoFactorSetup = /* @__PURE__ */ __name((options = {}) => {
       onComplete?.(codes);
       return codes;
     } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : "Invalid code. Please try again.";
+      const errorMessage = extractTwoFactorError(err, "Invalid code. Please try again.");
       authLogger.error("2FA setup confirmation error:", err);
       setError(errorMessage);
       setSetupStep("scanning");
@@ -3314,17 +3340,6 @@ var useTwoFactorSetup = /* @__PURE__ */ __name((options = {}) => {
 
 // src/auth/hooks/useTwoFactorStatus.ts
 var import_react12 = require("react");
-function extractErrorMessage(err, fallback) {
-  if (err instanceof APIError) {
-    const body = err.response;
-    if (typeof body?.error === "string") return body.error;
-    if (typeof body?.detail === "string") return body.detail;
-    return err.message;
-  }
-  if (err instanceof Error) return err.message;
-  return fallback;
-}
-__name(extractErrorMessage, "extractErrorMessage");
 var useTwoFactorStatus = /* @__PURE__ */ __name(() => {
   const [isLoading, setIsLoading] = (0, import_react12.useState)(false);
   const [error, setError] = (0, import_react12.useState)(null);
@@ -3351,7 +3366,7 @@ var useTwoFactorStatus = /* @__PURE__ */ __name(() => {
       setHas2FAEnabled(response.has_2fa_enabled);
       authLogger.info("2FA status:", response.has_2fa_enabled ? "enabled" : "disabled");
     } catch (err) {
-      const errorMessage = extractErrorMessage(err, "Failed to fetch 2FA status");
+      const errorMessage = extractTwoFactorError(err, "Failed to fetch 2FA status");
       authLogger.error("Failed to fetch 2FA status:", err);
       setError(errorMessage);
     } finally {
@@ -3359,7 +3374,7 @@ var useTwoFactorStatus = /* @__PURE__ */ __name(() => {
     }
   }, []);
   const disable2FA = (0, import_react12.useCallback)(async (code) => {
-    if (!code || code.length !== 6) {
+    if (!isValidTotpCode(code)) {
       setError("Please enter a 6-digit code");
       return false;
     }
@@ -3373,7 +3388,7 @@ var useTwoFactorStatus = /* @__PURE__ */ __name(() => {
       authLogger.info("2FA disabled successfully");
       return true;
     } catch (err) {
-      const errorMessage = extractErrorMessage(err, "Invalid verification code");
+      const errorMessage = extractTwoFactorError(err, "Invalid verification code");
       authLogger.error("Failed to disable 2FA:", err);
       setError(errorMessage);
       return false;
@@ -3392,6 +3407,14 @@ var useTwoFactorStatus = /* @__PURE__ */ __name(() => {
   };
 }, "useTwoFactorStatus");
 
+// src/auth/hooks/useTwoFactor.ts
+var useTwoFactor = /* @__PURE__ */ __name((options = {}) => {
+  const verify = useTwoFactorVerify(options.verify);
+  const setup = useTwoFactorSetup(options.setup);
+  const status = useTwoFactorStatus();
+  return { verify, setup, status };
+}, "useTwoFactor");
+
 // src/auth/hooks/useLocalStorage.ts
 var import_react13 = require("react");
 function useLocalStorage(key, initialValue) {