@ollaid/native-sso 2.7.1 → 2.7.2

package/dist/index.cjs

@@ -9617,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;
@@ -9634,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("");
@@ -9656,6 +9654,7 @@ function LoginModal({
     setLoginSuccess(false);
     setLoginData(null);
     setResendCooldown(0);
+    setPasswordSubmitting(false);
     resetAuth();
   }, [resetAuth]);
   react.useEffect(() => {
@@ -9668,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();
@@ -9690,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);
@@ -9965,7 +9992,7 @@ function LoginModal({
                     placeholder: "••••••••",
                     value: password,
                     onChange: (e) => setPassword(e.target.value),
-                    disabled: isSubmitting,
+                    disabled: isSubmitting || passwordSubmitting,
                     style: { paddingRight: "2.5rem" }
                   }
                 ),
@@ -9981,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" }) })
@@ -13237,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();
@@ -13259,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);
@@ -13426,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: "",
@@ -13442,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;
@@ -13489,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);
@@ -13506,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);
@@ -13522,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();
@@ -13644,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, {}),