@djangocfg/api 2.1.428 → 2.1.430

package/dist/auth.mjs

@@ -27,7 +27,7 @@ import {
   useContext as useContext2,
   useEffect as useEffect9,
   useMemo as useMemo3,
-  useRef as useRef6,
+  useRef as useRef7,
   useState as useState12
 } from "react";
 import { SWRConfig } from "swr";
@@ -125,10 +125,22 @@ function useQueryParams() {
     }, "updateQueryParams");
     updateQueryParams();
     window.addEventListener("popstate", updateQueryParams);
-    const intervalId = setInterval(updateQueryParams, 100);
+    const origPush = window.history.pushState;
+    const origReplace = window.history.replaceState;
+    window.history.pushState = function(...args) {
+      const result = origPush.apply(this, args);
+      updateQueryParams();
+      return result;
+    };
+    window.history.replaceState = function(...args) {
+      const result = origReplace.apply(this, args);
+      updateQueryParams();
+      return result;
+    };
     return () => {
       window.removeEventListener("popstate", updateQueryParams);
-      clearInterval(intervalId);
+      window.history.pushState = origPush;
+      window.history.replaceState = origReplace;
     };
   }, [pathname]);
   return queryParams;
@@ -216,7 +228,7 @@ var useAuthValidation = /* @__PURE__ */ __name(() => {
 var validateIdentifier = /* @__PURE__ */ __name((id) => EMAIL_REGEX.test(id), "validateIdentifier");
 
 // src/auth/hooks/useAuthForm.ts
-import { useCallback as useCallback5, useEffect as useEffect4, useRef as useRef3 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect4, useRef as useRef4 } from "react";
 
 // src/auth/utils/logger.ts
 import { createConsola } from "consola";
@@ -270,7 +282,7 @@ var authLogger = logger.withTag("auth");
 
 // src/auth/hooks/useAutoAuth.ts
 import { usePathname as usePathname2 } from "next/navigation";
-import { useEffect as useEffect3 } from "react";
+import { useEffect as useEffect3, useRef as useRef3 } from "react";
 var normalizePath = /* @__PURE__ */ __name((path) => {
   if (!path) return "";
   const withoutLocale = path.replace(/^\/[a-z]{2}(?=\/|$)/, "");
@@ -286,25 +298,27 @@ var useAutoAuth = /* @__PURE__ */ __name((options = {}) => {
   const isAllowedPath = allowedPaths.some(
     (path) => normalizedPath === path || normalizedPath.startsWith(path + "/")
   );
-  const hasOTP = !!queryParams.get("otp");
+  const queryOtp = queryParams.get("otp") || "";
+  const queryEmail = queryParams.get("email") || void 0;
+  const hasOTP = !!queryOtp;
   const isReady = !!pathname && hasOTP && isAllowedPath;
+  const otpValid = queryOtp.length === AUTH_CONSTANTS.EMAIL_OTP_LENGTH;
+  const onOTPDetectedRef = useRef3(onOTPDetected);
+  onOTPDetectedRef.current = onOTPDetected;
   useEffect3(() => {
-    if (!isReady) return;
-    const queryOtp = queryParams.get("otp");
-    const queryEmail = queryParams.get("email") || void 0;
-    if (queryOtp && typeof queryOtp === "string" && queryOtp.length === AUTH_CONSTANTS.EMAIL_OTP_LENGTH) {
-      authLogger.info("OTP detected in URL on auth page:", queryOtp);
-      onOTPDetected?.(queryOtp, queryEmail);
-    }
-    if (cleanupUrl && queryOtp) {
-      const cleanQuery = Object.fromEntries(queryParams.entries());
-      delete cleanQuery.otp;
-      delete cleanQuery.email;
-      const queryString = new URLSearchParams(cleanQuery).toString();
-      const realPathname = typeof window !== "undefined" ? window.location.pathname : pathname;
-      router.replace(queryString ? `${realPathname}?${queryString}` : realPathname);
-    }
-  }, [pathname, queryParams, onOTPDetected, cleanupUrl, router, isReady]);
+    if (!isReady || !otpValid) return;
+    authLogger.info("OTP detected in URL on auth page:", queryOtp);
+    onOTPDetectedRef.current?.(queryOtp, queryEmail);
+  }, [isReady, otpValid, queryOtp, queryEmail]);
+  useEffect3(() => {
+    if (!isReady || !cleanupUrl || !queryOtp) return;
+    const cleanQuery = Object.fromEntries(queryParams.entries());
+    delete cleanQuery.otp;
+    delete cleanQuery.email;
+    const queryString = new URLSearchParams(cleanQuery).toString();
+    const realPathname = typeof window !== "undefined" ? window.location.pathname : pathname;
+    router.replace(queryString ? `${realPathname}?${queryString}` : realPathname);
+  }, [isReady, cleanupUrl, queryOtp]);
   return {
     isReady,
     hasOTP,
@@ -2698,7 +2712,8 @@ var useAuthForm = /* @__PURE__ */ __name((options) => {
   } = options;
   const formState = useAuthFormState();
   const validation = useAuthValidation();
-  const isAutoSubmitFromUrlRef = useRef3(false);
+  const isAutoSubmitFromUrlRef = useRef4(false);
+  const processedOtpKeyRef = useRef4(null);
   const {
     requestOTP,
     verifyOTP,
@@ -2909,29 +2924,32 @@ var useAuthForm = /* @__PURE__ */ __name((options) => {
     setTwoFactorCode("");
     clearError();
   }, [setUseBackupCode, setTwoFactorCode, clearError]);
-  useAutoAuth({
-    allowedPaths: [authPath],
-    onOTPDetected: /* @__PURE__ */ __name((detectedOtp, detectedEmail) => {
-      if (isAutoSubmitFromUrlRef.current || isLoading) return;
-      isAutoSubmitFromUrlRef.current = true;
-      authLogger.info("OTP detected from URL, auto-submitting");
-      const autoIdentifier = detectedEmail || getSavedEmail() || "";
-      if (!autoIdentifier) {
-        authLogger.warn("No identifier found for auto-submit (no email in URL or storage)");
+  const handleOTPFromUrl = useCallback5((detectedOtp, detectedEmail) => {
+    const autoIdentifier = detectedEmail || getSavedEmail() || "";
+    if (!autoIdentifier) {
+      authLogger.warn("No identifier found for auto-submit (no email in URL or storage)");
+      return;
+    }
+    const otpKey = `${autoIdentifier}:${detectedOtp}`;
+    if (processedOtpKeyRef.current === otpKey) return;
+    if (isAutoSubmitFromUrlRef.current) return;
+    processedOtpKeyRef.current = otpKey;
+    isAutoSubmitFromUrlRef.current = true;
+    authLogger.info("OTP detected from URL, auto-submitting");
+    setIdentifier(autoIdentifier);
+    setOtp(detectedOtp);
+    setStep("otp");
+    setTimeout(async () => {
+      try {
+        await submitOTP(autoIdentifier, detectedOtp);
+      } finally {
         isAutoSubmitFromUrlRef.current = false;
-        return;
       }
-      setIdentifier(autoIdentifier);
-      setOtp(detectedOtp);
-      setStep("otp");
-      setTimeout(async () => {
-        try {
-          await submitOTP(autoIdentifier, detectedOtp);
-        } finally {
-          isAutoSubmitFromUrlRef.current = false;
-        }
-      }, 100);
-    }, "onOTPDetected"),
+    }, 100);
+  }, [getSavedEmail, setIdentifier, setOtp, setStep, submitOTP]);
+  useAutoAuth({
+    allowedPaths: [authPath],
+    onOTPDetected: handleOTPFromUrl,
     cleanupUrl: true
   });
   return {
@@ -3775,7 +3793,7 @@ function getCacheMetadata() {
 __name(getCacheMetadata, "getCacheMetadata");
 
 // src/auth/hooks/useTokenRefresh.ts
-import { useCallback as useCallback9, useEffect as useEffect7, useRef as useRef4 } from "react";
+import { useCallback as useCallback9, useEffect as useEffect7, useRef as useRef5 } from "react";
 var TOKEN_REFRESH_THRESHOLD_MS = 10 * 60 * 1e3;
 var CHECK_INTERVAL_MS = 5 * 60 * 1e3;
 function getTokenExpiry(token) {
@@ -3796,7 +3814,7 @@ function isTokenExpiringSoon(token, thresholdMs) {
 __name(isTokenExpiringSoon, "isTokenExpiringSoon");
 function useTokenRefresh(options = {}) {
   const { enabled = true, onRefresh, onRefreshError } = options;
-  const isRefreshingRef = useRef4(false);
+  const isRefreshingRef = useRef5(false);
   const refreshToken = useCallback9(async () => {
     if (isRefreshingRef.current) {
       authLogger.debug("Token refresh already in progress");
@@ -3915,7 +3933,7 @@ import {
   useContext,
   useEffect as useEffect8,
   useMemo as useMemo2,
-  useRef as useRef5,
+  useRef as useRef6,
   useState as useState11
 } from "react";
 
@@ -4502,8 +4520,8 @@ function AccountsProvider({ children }) {
   });
   const [isLoadingProfile, setIsLoadingProfile] = useState11(false);
   const [profileError, setProfileError] = useState11(null);
-  const profileRef = useRef5(profile);
-  const isLoadingRef = useRef5(false);
+  const profileRef = useRef6(profile);
+  const isLoadingRef = useRef6(false);
   useEffect8(() => {
     profileRef.current = profile;
   }, [profile]);
@@ -4671,9 +4689,9 @@ var AuthProviderInternal = /* @__PURE__ */ __name(({ children, config }) => {
     }, "onRefreshError")
   });
   const user = accounts.profile;
-  const userRef = useRef6(user);
-  const configRef = useRef6(config);
-  const isLoadingProfileRef = useRef6(false);
+  const userRef = useRef7(user);
+  const configRef = useRef7(config);
+  const isLoadingProfileRef = useRef7(false);
   useEffect9(() => {
     userRef.current = user;
   }, [user]);
@@ -4699,7 +4717,7 @@ var AuthProviderInternal = /* @__PURE__ */ __name(({ children, config }) => {
     }
     return false;
   }, [clearAuthState]);
-  const isAutoLoggingOutRef = useRef6(false);
+  const isAutoLoggingOutRef = useRef7(false);
   const swrOnError = useCallback12((error) => {
     const isAuthError = error?.status === 401 || error?.statusCode === 401 || error?.code === "token_not_valid" || error?.code === "authentication_failed";
     if (isAuthError && !isAutoLoggingOutRef.current) {