@ollaid/native-sso 2.7.0 → 2.7.2

package/dist/index.cjs

@@ -291,17 +291,18 @@ function OTPInput({
   disabled = false,
   autoFocus = true
 }) {
+  const safeLength = Number.isFinite(length) ? Math.max(1, Math.min(12, Math.trunc(length))) : 6;
   const inputRefs = react.useRef([]);
   const [activeIndex, setActiveIndex] = react.useState(0);
   react.useEffect(() => {
-    inputRefs.current = inputRefs.current.slice(0, length);
-  }, [length]);
+    inputRefs.current = inputRefs.current.slice(0, safeLength);
+  }, [safeLength]);
   react.useEffect(() => {
     if (autoFocus && inputRefs.current[0]) inputRefs.current[0].focus();
   }, [autoFocus]);
   react.useEffect(() => {
-    if (value.length === length && onComplete) onComplete(value);
-  }, [value, length, onComplete]);
+    if (value.length === safeLength && onComplete) onComplete(value);
+  }, [value, safeLength, onComplete]);
   const handleChange = (index, char) => {
     var _a;
     if (disabled) return;
@@ -309,8 +310,8 @@ function OTPInput({
     if (!digit) return;
     const newValue = value.split("");
     newValue[index] = digit;
-    onChange(newValue.join("").slice(0, length));
-    if (index < length - 1) {
+    onChange(newValue.join("").slice(0, safeLength));
+    if (index < safeLength - 1) {
       (_a = inputRefs.current[index + 1]) == null ? void 0 : _a.focus();
       setActiveIndex(index + 1);
     }
@@ -333,7 +334,7 @@ function OTPInput({
     } else if (e.key === "ArrowLeft" && index > 0) {
       (_b = inputRefs.current[index - 1]) == null ? void 0 : _b.focus();
       setActiveIndex(index - 1);
-    } else if (e.key === "ArrowRight" && index < length - 1) {
+    } else if (e.key === "ArrowRight" && index < safeLength - 1) {
       (_c = inputRefs.current[index + 1]) == null ? void 0 : _c.focus();
       setActiveIndex(index + 1);
     }
@@ -344,14 +345,14 @@ function OTPInput({
     e.preventDefault();
     const pasted = e.clipboardData.getData("text").replace(/[^0-9]/g, "");
     if (pasted) {
-      const newValue = pasted.slice(0, length);
+      const newValue = pasted.slice(0, safeLength);
       onChange(newValue);
-      const focusIndex = Math.min(newValue.length, length - 1);
+      const focusIndex = Math.min(newValue.length, safeLength - 1);
       (_a = inputRefs.current[focusIndex]) == null ? void 0 : _a.focus();
       setActiveIndex(focusIndex);
     }
   };
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { style: { display: "flex", alignItems: "center", justifyContent: "center", gap: "0.5rem" }, children: Array.from({ length }).map((_, index) => /* @__PURE__ */ jsxRuntime.jsx(
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { style: { display: "flex", alignItems: "center", justifyContent: "center", gap: "0.5rem" }, children: Array.from({ length: safeLength }).map((_, index) => /* @__PURE__ */ jsxRuntime.jsx(
     "input",
     {
       ref: (el) => inputRefs.current[index] = el,
@@ -7557,8 +7558,12 @@ function getHeaders(token, includeConfigPrefix = false) {
 let credentials = null;
 let credentialsLoadedAt = 0;
 let credentialsTtl = 300;
+let refreshInFlight = null;
+let lastSuccessfulRefreshAt = 0;
+let lastSuccessfulRefreshResponse = null;
 const DEFAULT_TTL = 300;
 const REFRESH_MARGIN = 30;
+const REFRESH_COOLDOWN_MS = 60 * 1e3;
 const nativeAuthService = {
   hasCredentials() {
     return credentials !== null;
@@ -7857,6 +7862,16 @@ const nativeAuthService = {
     }
   },
   async refresh() {
+    const now = Date.now();
+    if (refreshInFlight) {
+      return refreshInFlight;
+    }
+    if ((lastSuccessfulRefreshResponse == null ? void 0 : lastSuccessfulRefreshResponse.success) && lastSuccessfulRefreshAt && now - lastSuccessfulRefreshAt < REFRESH_COOLDOWN_MS) {
+      if (isDebugMode()) {
+        console.log("🔄 [SaaS] POST /native/refresh — cooldown actif, réponse réutilisée");
+      }
+      return lastSuccessfulRefreshResponse;
+    }
     const cfg = getNativeAuthConfig();
     if (!cfg.saasApiUrl) {
       throw new ApiError("saasApiUrl non configurée", "unknown");
@@ -7869,51 +7884,62 @@ const nativeAuthService = {
     if (isDebugMode()) {
       console.log("📤 [SaaS] POST /native/refresh");
     }
-    let response;
-    try {
-      response = await fetchWithTimeout(
-        `${cfg.saasApiUrl}/native/refresh`,
-        {
-          method: "POST",
-          headers: getHeaders(void 0, true),
-          body: JSON.stringify({ refresh_token: refreshToken })
-        },
-        cfg.timeout || 3e4
-      );
-    } catch (err) {
-      if (err instanceof ApiError) {
-        if (err.statusCode === 401) {
-          return {
-            success: false,
-            error_type: err.errorType || "invalid_refresh",
-            message: err.message
-          };
+    refreshInFlight = (async () => {
+      try {
+        let response;
+        try {
+          response = await fetchWithTimeout(
+            `${cfg.saasApiUrl}/native/refresh`,
+            {
+              method: "POST",
+              headers: getHeaders(void 0, true),
+              body: JSON.stringify({ refresh_token: refreshToken })
+            },
+            cfg.timeout || 3e4
+          );
+        } catch (err) {
+          if (err instanceof ApiError) {
+            if (err.statusCode === 401) {
+              response = {
+                success: false,
+                error_type: err.errorType || "invalid_refresh",
+                message: err.message
+              };
+            } else if (err.statusCode === 404) {
+              response = {
+                success: false,
+                error_type: "not_supported",
+                message: "Endpoint refresh non disponible sur ce SaaS"
+              };
+            } else {
+              throw err;
+            }
+          } else {
+            throw err;
+          }
         }
-        if (err.statusCode === 404) {
-          return {
-            success: false,
-            error_type: "not_supported",
-            message: "Endpoint refresh non disponible sur ce SaaS"
-          };
+        if (response.success) {
+          if (response.token) {
+            setAuthToken(response.token);
+          }
+          const storage = getNativeStorage();
+          if (response.expires_at) storage.setItem(STORAGE.TOKEN_EXPIRES_AT, response.expires_at);
+          if (response.refresh_token) storage.setItem(STORAGE.REFRESH_TOKEN, response.refresh_token);
+          if (response.refresh_expires_at) storage.setItem(STORAGE.REFRESH_EXPIRES_AT, response.refresh_expires_at);
+          if (response.app_access_token_ref) storage.setItem(STORAGE.APP_ACCESS_TOKEN_REF, response.app_access_token_ref);
+          if (response.alias_reference) storage.setItem(STORAGE.ALIAS_REFERENCE, response.alias_reference);
+          if (response.user) {
+            setAuthUser(response.user);
+          }
+          lastSuccessfulRefreshAt = Date.now();
+          lastSuccessfulRefreshResponse = response;
         }
+        return response;
+      } finally {
+        refreshInFlight = null;
       }
-      throw err;
-    }
-    if (response.success) {
-      if (response.token) {
-        setAuthToken(response.token);
-      }
-      const storage = getNativeStorage();
-      if (response.expires_at) storage.setItem(STORAGE.TOKEN_EXPIRES_AT, response.expires_at);
-      if (response.refresh_token) storage.setItem(STORAGE.REFRESH_TOKEN, response.refresh_token);
-      if (response.refresh_expires_at) storage.setItem(STORAGE.REFRESH_EXPIRES_AT, response.refresh_expires_at);
-      if (response.app_access_token_ref) storage.setItem(STORAGE.APP_ACCESS_TOKEN_REF, response.app_access_token_ref);
-      if (response.alias_reference) storage.setItem(STORAGE.ALIAS_REFERENCE, response.alias_reference);
-      if (response.user) {
-        setAuthUser(response.user);
-      }
-    }
-    return response;
+    })();
+    return refreshInFlight;
   },
   async logout(token) {
     const config2 = getNativeAuthConfig();
@@ -7962,11 +7988,17 @@ const nativeAuthService = {
     clearAuthToken();
     credentials = null;
     credentialsLoadedAt = 0;
+    refreshInFlight = null;
+    lastSuccessfulRefreshAt = 0;
+    lastSuccessfulRefreshResponse = null;
     return { success: true };
   },
   clearCredentials() {
     credentials = null;
     credentialsLoadedAt = 0;
+    refreshInFlight = null;
+    lastSuccessfulRefreshAt = 0;
+    lastSuccessfulRefreshResponse = null;
   },
   // ============================================
   // High-level methods
@@ -9585,6 +9617,8 @@ function LoginModal({
   const [loginSuccess, setLoginSuccess] = react.useState(false);
   const [loginData, setLoginData] = react.useState(null);
   const [showPasswordRecovery, setShowPasswordRecovery] = react.useState(false);
+  const [passwordSubmitting, setPasswordSubmitting] = react.useState(false);
+  const successCallbackTimerRef = react.useRef(null);
   const CCPHONE = "+221";
   const isSubmitting = authLoading || loading;
   const error = localError || authError;
@@ -9602,15 +9636,11 @@ function LoginModal({
       setResendCooldown(60);
     }
   }, [status, step]);
-  react.useEffect(() => {
-    if (loginSuccess && loginData) {
-      const timer = setTimeout(() => {
-        onLoginSuccess == null ? void 0 : onLoginSuccess(loginData.token, loginData.user);
-      }, 1e3);
-      return () => clearTimeout(timer);
-    }
-  }, [loginSuccess, loginData, onLoginSuccess]);
   const resetState = react.useCallback(() => {
+    if (successCallbackTimerRef.current) {
+      clearTimeout(successCallbackTimerRef.current);
+      successCallbackTimerRef.current = null;
+    }
     setStep("choice");
     setEmail("");
     setPassword("");
@@ -9624,6 +9654,7 @@ function LoginModal({
     setLoginSuccess(false);
     setLoginData(null);
     setResendCooldown(0);
+    setPasswordSubmitting(false);
     resetAuth();
   }, [resetAuth]);
   react.useEffect(() => {
@@ -9636,12 +9667,34 @@ function LoginModal({
     }
   }, [open, initialPhone]);
   const finalizeLogin = (result) => {
-    if (result.success && result.user) {
+    if (result.success) {
       const token = getAuthToken() || "";
-      setLoginData({ token, user: result.user });
-      setLoginSuccess(true);
+      const resolvedUser = result.user || user;
+      if (resolvedUser) {
+        setLoginData({ token, user: resolvedUser });
+        setLoginSuccess(true);
+      }
     }
   };
+  react.useEffect(() => {
+    if (!loginSuccess || !loginData || !onLoginSuccess) return;
+    if (successCallbackTimerRef.current) {
+      clearTimeout(successCallbackTimerRef.current);
+    }
+    successCallbackTimerRef.current = setTimeout(() => {
+      try {
+        onLoginSuccess(loginData.token, loginData.user);
+      } catch (callbackError) {
+        console.error("Erreur dans onLoginSuccess", callbackError);
+      }
+    }, 900);
+    return () => {
+      if (successCallbackTimerRef.current) {
+        clearTimeout(successCallbackTimerRef.current);
+        successCallbackTimerRef.current = null;
+      }
+    };
+  }, [loginSuccess, loginData, onLoginSuccess]);
   const handleEmailCheck = async () => {
     setLocalError(null);
     clearError();
@@ -9658,18 +9711,24 @@ function LoginModal({
   };
   const handleEmailPasswordSubmit = async (e) => {
     e.preventDefault();
+    if (passwordSubmitting || isSubmitting) return;
+    setPasswordSubmitting(true);
     setLocalError(null);
     clearError();
-    if (!password) {
-      setLocalError("Le mot de passe est requis");
-      return;
-    }
-    if (password.length < 8) {
-      setLocalError("Le mot de passe doit contenir au moins 8 caractères");
-      return;
+    try {
+      if (!password) {
+        setLocalError("Le mot de passe est requis");
+        return;
+      }
+      if (password.length < 8) {
+        setLocalError("Le mot de passe doit contenir au moins 8 caractères");
+        return;
+      }
+      const result = await submitPassword(password);
+      finalizeLogin(result);
+    } finally {
+      setPasswordSubmitting(false);
     }
-    const result = await submitPassword(password);
-    finalizeLogin(result);
   };
   const handleEmailOtpVerify = async () => {
     setLocalError(null);
@@ -9933,7 +9992,7 @@ function LoginModal({
                     placeholder: "••••••••",
                     value: password,
                     onChange: (e) => setPassword(e.target.value),
-                    disabled: isSubmitting,
+                    disabled: isSubmitting || passwordSubmitting,
                     style: { paddingRight: "2.5rem" }
                   }
                 ),
@@ -9949,7 +10008,7 @@ function LoginModal({
               ] })
             ] })
           ] }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(DialogFooter, { children: /* @__PURE__ */ jsxRuntime.jsx(Button, { type: "submit", disabled: isSubmitting || !password, style: { width: "100%" }, children: isSubmitting ? /* @__PURE__ */ jsxRuntime.jsxs("span", { style: { display: "flex", alignItems: "center", gap: "0.5rem" }, children: [
+          /* @__PURE__ */ jsxRuntime.jsx(DialogFooter, { children: /* @__PURE__ */ jsxRuntime.jsx(Button, { type: "submit", disabled: isSubmitting || passwordSubmitting || !password, style: { width: "100%" }, children: isSubmitting ? /* @__PURE__ */ jsxRuntime.jsxs("span", { style: { display: "flex", alignItems: "center", gap: "0.5rem" }, children: [
             /* @__PURE__ */ jsxRuntime.jsx(IconLoader2, { style: { width: "1rem", height: "1rem" } }),
             "Connexion..."
           ] }) : "Se connecter" }) })
@@ -13205,6 +13264,8 @@ function NativeSSOPage({
   const [showOnboarding, setShowOnboarding] = react.useState(false);
   const [pendingSession, setPendingSession] = react.useState(null);
   const [debugOnboardingState, setDebugOnboardingState] = react.useState(null);
+  const [redirectingTarget, setRedirectingTarget] = react.useState(null);
+  const [redirectingReason, setRedirectingReason] = react.useState(null);
   const [session, setSession] = react.useState(() => {
     try {
       const storage2 = getNativeStorage();
@@ -13227,6 +13288,17 @@ function NativeSSOPage({
   react.useEffect(() => {
     sessionRef.current = session;
   }, [session]);
+  react.useEffect(() => {
+    if (!redirectingTarget) return;
+    const timer = window.setTimeout(() => {
+      const redirected = safeRedirect(redirectingTarget);
+      if (!redirected) {
+        setRedirectingTarget(null);
+        setRedirectingReason(null);
+      }
+    }, 200);
+    return () => window.clearTimeout(timer);
+  }, [redirectingTarget]);
   const clearOnboardingTimers = react.useCallback(() => {
     if (onboardingPromptTimerRef.current) {
       clearTimeout(onboardingPromptTimerRef.current);
@@ -13394,6 +13466,12 @@ function NativeSSOPage({
     setLoginInitialPhone(phone);
     setTimeout(() => setModal("login"), 150);
   }, []);
+  const beginRedirect = react.useCallback((target, reason = "login") => {
+    if (!target) return false;
+    setRedirectingReason(reason);
+    setRedirectingTarget(target);
+    return true;
+  }, []);
   const handleLoginSuccess = react.useCallback((token, user) => {
     const userObj = {
       reference: "",
@@ -13410,10 +13488,14 @@ function NativeSSOPage({
     void refreshSessionProfile(true);
     if (!needsOnboarding(userObj)) {
       markProfilePromptComplete();
-      onLoginSuccess == null ? void 0 : onLoginSuccess(token, user);
-      safeRedirect(redirectAfterLogin);
+      try {
+        onLoginSuccess == null ? void 0 : onLoginSuccess(token, user);
+      } catch (callbackError) {
+        console.error("Erreur dans le callback onLoginSuccess du wrapper SSO", callbackError);
+      }
+      beginRedirect(redirectAfterLogin, "login");
     }
-  }, [onLoginSuccess, redirectAfterLogin, persistSessionUser, syncProfilePrompt, refreshSessionProfile, accountType]);
+  }, [onLoginSuccess, redirectAfterLogin, persistSessionUser, syncProfilePrompt, refreshSessionProfile, accountType, beginRedirect]);
   const handleOnboardingComplete = react.useCallback((data) => {
     const activeSession = debugOnboardingState || pendingSession;
     if (!activeSession) return;
@@ -13457,11 +13539,15 @@ function NativeSSOPage({
     if (!debugOnboardingState) {
       persistSessionUser(activeSession.token, activeSession.user);
       snoozeProfilePrompt(PROFILE_PROMPT_SNOOZE_MS / (60 * 60 * 1e3));
-      onLoginSuccess == null ? void 0 : onLoginSuccess(activeSession.token, activeSession.user);
-      safeRedirect(redirectAfterLogin);
+      try {
+        onLoginSuccess == null ? void 0 : onLoginSuccess(activeSession.token, activeSession.user);
+      } catch (callbackError) {
+        console.error("Erreur dans le callback onLoginSuccess du wrapper SSO", callbackError);
+      }
+      beginRedirect(redirectAfterLogin, "login");
       return;
     }
-  }, [pendingSession, debugOnboardingState, onLoginSuccess, redirectAfterLogin, persistSessionUser]);
+  }, [pendingSession, debugOnboardingState, onLoginSuccess, redirectAfterLogin, persistSessionUser, beginRedirect]);
   const handleOnboardingDismiss = react.useCallback(() => {
     setShowOnboarding(false);
     setPendingSession(null);
@@ -13474,8 +13560,8 @@ function NativeSSOPage({
     setDebugOnboardingState(null);
     clearOnboardingTimers();
     onLogout == null ? void 0 : onLogout();
-    safeRedirect(redirectAfterLogout);
-  }, [onLogout, redirectAfterLogout, clearOnboardingTimers]);
+    beginRedirect(redirectAfterLogout, "logout");
+  }, [onLogout, redirectAfterLogout, clearOnboardingTimers, beginRedirect]);
   const openDebugLogin = react.useCallback(() => {
     clearOnboardingTimers();
     setShowOnboarding(false);
@@ -13490,6 +13576,10 @@ function NativeSSOPage({
     setDebugOnboardingState(null);
     setModal("signup");
   }, [clearOnboardingTimers]);
+  react.useEffect(() => {
+    if (!(session == null ? void 0 : session.token) || !redirectAfterLogin || redirectingTarget) return;
+    beginRedirect(redirectAfterLogin, "already-authenticated");
+  }, [session == null ? void 0 : session.token, redirectAfterLogin, redirectingTarget, beginRedirect]);
   const openDebugOnboarding = react.useCallback((preset = "current") => {
     if (!session) return;
     clearOnboardingTimers();
@@ -13612,14 +13702,18 @@ function NativeSSOPage({
       overflow: "hidden"
     }, children: /* @__PURE__ */ jsxRuntime.jsx(AppsLogoSlider, { iamApiUrl, speed: "normal" }) }) })
   ] }) });
+  if (redirectingTarget) {
+    return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: containerStyle, children: [
+      /* @__PURE__ */ jsxRuntime.jsx(TopBranding, { subtitle: title }),
+      /* @__PURE__ */ jsxRuntime.jsx(SliderBadge, {}),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { style: cardStyle, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { padding: "2rem 1.5rem 1.5rem", textAlign: "center" }, children: [
+        /* @__PURE__ */ jsxRuntime.jsx("h2", { style: { fontSize: "1.25rem", fontWeight: 600, color: COLORS.cardForeground }, children: redirectingReason === "logout" ? "Déconnexion réussie" : redirectingReason === "already-authenticated" ? "Session déjà valide" : "Connexion réussie" }),
+        /* @__PURE__ */ jsxRuntime.jsx("p", { style: { fontSize: "0.875rem", color: COLORS.muted, marginTop: "0.5rem" }, children: "Redirection en cours..." })
+      ] }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(Footer, { hideFooter })
+    ] });
+  }
   if (session) {
-    if (redirectAfterLogin) {
-      safeRedirect(redirectAfterLogin);
-      return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: containerStyle, children: [
-        /* @__PURE__ */ jsxRuntime.jsx(TopBranding, { subtitle: title }),
-        /* @__PURE__ */ jsxRuntime.jsx("p", { style: { color: "rgba(255,255,255,0.7)", fontSize: "0.875rem" }, children: "Redirection en cours..." })
-      ] });
-    }
     return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: containerStyle, children: [
       /* @__PURE__ */ jsxRuntime.jsx(TopBranding, { subtitle: title }),
       /* @__PURE__ */ jsxRuntime.jsx(SliderBadge, {}),