@ollaid/native-sso 2.7.6 → 2.7.8

package/dist/index.d.ts

@@ -9,7 +9,7 @@
  * } />
  * ```
  *
- * @version 2.7.0
+ * @version 2.7.8
  */
 export { NativeSSOPage } from './components/NativeSSOPage';
 export type { NativeSSOPageProps } from './components/NativeSSOPage';

package/dist/index.js

@@ -12144,26 +12144,41 @@ const C = {
   gray700: "#374151",
   white: "#ffffff"
 };
-function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missing", profileHydrating = false, onComplete, onSkip }) {
+function OnboardingModal({
+  open,
+  onOpenChange,
+  onDismiss,
+  user,
+  variant = "missing",
+  profileHydrating = false,
+  hydrateProfile = true,
+  onUserInfosSync,
+  onComplete,
+  onSkip
+}) {
   var _a;
   const isEditMode = variant === "edit";
-  const hasCurrentPhone = Boolean(user.phone);
-  const hasCurrentEmail = Boolean(user.email);
+  const [hydratedUser, setHydratedUser] = useState(null);
+  const [internalHydrating, setInternalHydrating] = useState(false);
+  const hydrationKeyRef = useRef(null);
+  const profileUser = hydratedUser ?? user;
+  const hasCurrentPhone = Boolean(profileUser.phone);
+  const hasCurrentEmail = Boolean(profileUser.email);
   const directPhoneEdit = !isEditMode || !hasCurrentPhone;
   const directEmailEdit = !isEditMode || !hasCurrentEmail;
-  !isEditMode ? !((_a = user.name) == null ? void 0 : _a.trim()) : true;
-  const [name, setName] = useState(user.name || "");
+  !isEditMode ? !((_a = profileUser.name) == null ? void 0 : _a.trim()) : true;
+  const [name, setName] = useState(profileUser.name || "");
   const [photoPreview, setPhotoPreview] = useState("");
   const [avatarPickerOpen, setAvatarPickerOpen] = useState(false);
   const [pendingAvatarSrc, setPendingAvatarSrc] = useState(null);
   const [avatarUploading, setAvatarUploading] = useState(false);
   const avatarFileInputRef = useRef(null);
-  const [ccphone, setCcphone] = useState(user.ccphone || "+221");
-  const [phone, setPhone] = useState(user.phone || "");
-  const [email, setEmail] = useState(user.email || "");
-  const [address, setAddress] = useState(user.address || "");
-  const [town, setTown] = useState(user.town || "");
-  const [country, setCountry] = useState(user.country || DEFAULT_COUNTRY_CODE);
+  const [ccphone, setCcphone] = useState(profileUser.ccphone || "+221");
+  const [phone, setPhone] = useState(profileUser.phone || "");
+  const [email, setEmail] = useState(profileUser.email || "");
+  const [address, setAddress] = useState(profileUser.address || "");
+  const [town, setTown] = useState(profileUser.town || "");
+  const [country, setCountry] = useState(profileUser.country || DEFAULT_COUNTRY_CODE);
   const [submitting, setSubmitting] = useState(false);
   const [fileError, setFileError] = useState("");
   const [contactFlow, setContactFlow] = useState(null);
@@ -12173,34 +12188,54 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
   const [confirmAction, setConfirmAction] = useState(null);
   const [nowTick, setNowTick] = useState(Date.now());
   const userHydrationKey = [
-    user.reference || "",
-    user.name || "",
-    user.email || "",
-    user.ccphone || "",
-    user.phone || "",
-    user.address || "",
-    user.town || "",
-    user.country || "",
-    user.image_url || "",
-    user.auth_2fa ? "1" : "0"
+    profileUser.reference || "",
+    profileUser.name || "",
+    profileUser.email || "",
+    profileUser.ccphone || "",
+    profileUser.phone || "",
+    profileUser.address || "",
+    profileUser.town || "",
+    profileUser.country || "",
+    profileUser.image_url || "",
+    profileUser.auth_2fa ? "1" : "0"
   ].join("|");
-  const currentDialCode = (user.ccphone || ccphone || "+221").trim();
+  const currentDialCode = (profileUser.ccphone || ccphone || "+221").trim();
   const baseSmsAllowed = currentDialCode === "+221";
   const contactSmsAllowed = contactFlow ? contactFlow.kind === "phone" ? contactFlow.newCcphone.trim() === "+221" : baseSmsAllowed : baseSmsAllowed;
   const lockModalClose = profileHydrating || submitting || submitState === "success" || avatarUploading || Boolean(contactFlow == null ? void 0 : contactFlow.loading);
+  const syncFormFromUser = useCallback((nextUser) => {
+    setName(nextUser.name || "");
+    setPhotoPreview(isEditMode ? nextUser.image_url || "" : "");
+    setCcphone(nextUser.ccphone || "+221");
+    setPhone(nextUser.phone || "");
+    setEmail(nextUser.email || "");
+    setAddress(nextUser.address || "");
+    setTown(nextUser.town || "");
+    setCountry(nextUser.country || DEFAULT_COUNTRY_CODE);
+  }, [isEditMode]);
+  const toUserInfos = useCallback((nextUser) => ({
+    reference: nextUser.reference,
+    name: nextUser.name,
+    email: nextUser.email || null,
+    ccphone: nextUser.ccphone,
+    phone: nextUser.phone,
+    address: nextUser.address,
+    town: nextUser.town,
+    country: nextUser.country,
+    image_url: nextUser.image_url,
+    auth_2fa: nextUser.auth_2fa,
+    alias_reference: nextUser.alias_reference,
+    iam_reference: nextUser.iam_reference
+  }), []);
   useEffect(() => {
-    if (!open) return;
-    setName(user.name || "");
-    setPhotoPreview(isEditMode ? user.image_url || "" : "");
+    if (!open) {
+      setHydratedUser(null);
+      hydrationKeyRef.current = null;
+      return;
+    }
     setPendingAvatarSrc(null);
     setAvatarPickerOpen(false);
     setAvatarUploading(false);
-    setCcphone(user.ccphone || "+221");
-    setPhone(user.phone || "");
-    setEmail(user.email || "");
-    setAddress(user.address || "");
-    setTown(user.town || "");
-    setCountry(user.country || DEFAULT_COUNTRY_CODE);
     setSubmitting(false);
     setFileError("");
     setContactFlow(null);
@@ -12208,7 +12243,54 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
     setSubmitMessage("");
     setSubmitError("");
     setConfirmAction(null);
-  }, [open, isEditMode, userHydrationKey, user.name, user.image_url, user.ccphone, user.phone, user.email, user.address, user.town, user.country]);
+    syncFormFromUser(profileUser);
+  }, [open, userHydrationKey, profileUser, syncFormFromUser]);
+  useEffect(() => {
+    if (!open || !hydratedUser) return;
+    if (contactFlow || submitting || submitState !== "idle") return;
+    syncFormFromUser(hydratedUser);
+  }, [open, hydratedUser, contactFlow, submitting, submitState, syncFormFromUser]);
+  useEffect(() => {
+    if (!open || !hydrateProfile || profileHydrating || internalHydrating || hydratedUser) return;
+    const key = userHydrationKey;
+    if (hydrationKeyRef.current === key) return;
+    hydrationKeyRef.current = key;
+    let cancelled = false;
+    setInternalHydrating(true);
+    (async () => {
+      try {
+        const response = await profileService.getProfile();
+        const payload = response.user_infos || response.user || {};
+        const nextUser = {
+          ...profileUser,
+          name: payload.name || profileUser.name,
+          email: payload.email ?? profileUser.email ?? null,
+          ccphone: payload.ccphone || profileUser.ccphone,
+          phone: payload.phone || profileUser.phone,
+          address: payload.address || profileUser.address,
+          town: payload.town || profileUser.town,
+          country: payload.country || profileUser.country,
+          image_url: payload.image_url || profileUser.image_url,
+          auth_2fa: payload.auth_2fa ?? profileUser.auth_2fa,
+          alias_reference: payload.alias_reference || profileUser.alias_reference,
+          iam_reference: payload.iam_reference || profileUser.iam_reference
+        };
+        if (cancelled) return;
+        setHydratedUser(nextUser);
+        syncFormFromUser(nextUser);
+        onUserInfosSync == null ? void 0 : onUserInfosSync({ source: "hydration", user_infos: toUserInfos(nextUser) });
+      } catch {
+        if (cancelled) return;
+      } finally {
+        if (!cancelled) {
+          setInternalHydrating(false);
+        }
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [open, hydrateProfile, profileHydrating, internalHydrating, userHydrationKey, profileUser, onUserInfosSync, syncFormFromUser, toUserInfos]);
   useEffect(() => {
     if (!(contactFlow == null ? void 0 : contactFlow.resendAvailableAt)) return;
     const timer = window.setInterval(() => {
@@ -12244,9 +12326,9 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
     setSubmitError("");
     const data = {
       name: name.trim(),
-      ccphone: directPhoneEdit ? ccphone : user.ccphone || void 0,
-      phone: directPhoneEdit ? phone : user.phone || void 0,
-      email: directEmailEdit ? email.trim() : user.email || void 0,
+      ccphone: directPhoneEdit ? ccphone : profileUser.ccphone || void 0,
+      phone: directPhoneEdit ? phone : profileUser.phone || void 0,
+      email: directEmailEdit ? email.trim() : profileUser.email || void 0,
       ...address.trim() ? { address: address.trim() } : {},
       ...town.trim() ? { town: town.trim() } : {},
       ...country ? { country } : {}
@@ -12255,19 +12337,21 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
       const response = await profileService.updateProfile(data);
       const payload = response.user_infos || response.user || {};
       const updatedUser = {
-        ...user,
-        name: payload.name || data.name || user.name,
-        email: payload.email ?? data.email ?? user.email,
-        ccphone: payload.ccphone || data.ccphone || user.ccphone,
-        phone: payload.phone || data.phone || user.phone,
-        address: payload.address || data.address || user.address,
-        town: payload.town || data.town || user.town,
-        country: payload.country || data.country || user.country,
-        image_url: payload.image_url || user.image_url,
-        auth_2fa: payload.auth_2fa ?? user.auth_2fa,
-        alias_reference: payload.alias_reference || user.alias_reference,
-        iam_reference: payload.iam_reference || user.iam_reference
+        ...profileUser,
+        name: payload.name || data.name || profileUser.name,
+        email: payload.email ?? data.email ?? profileUser.email,
+        ccphone: payload.ccphone || data.ccphone || profileUser.ccphone,
+        phone: payload.phone || data.phone || profileUser.phone,
+        address: payload.address || data.address || profileUser.address,
+        town: payload.town || data.town || profileUser.town,
+        country: payload.country || data.country || profileUser.country,
+        image_url: payload.image_url || profileUser.image_url,
+        auth_2fa: payload.auth_2fa ?? profileUser.auth_2fa,
+        alias_reference: payload.alias_reference || profileUser.alias_reference,
+        iam_reference: payload.iam_reference || profileUser.iam_reference
       };
+      setHydratedUser(updatedUser);
+      onUserInfosSync == null ? void 0 : onUserInfosSync({ source: "update", user_infos: toUserInfos(updatedUser) });
       onComplete({
         name: updatedUser.name,
         image_url: updatedUser.image_url,
@@ -12298,7 +12382,7 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
       setSubmitState("error");
       setSubmitError(error instanceof Error ? error.message : "Erreur lors de l’enregistrement");
     }
-  }, [canSubmit, user, name, directPhoneEdit, directEmailEdit, ccphone, phone, email, address, town, country, onComplete, markSuccess]);
+  }, [canSubmit, profileUser, name, directPhoneEdit, directEmailEdit, ccphone, phone, email, address, town, country, onComplete, onUserInfosSync, toUserInfos, markSuccess]);
   const openAvatarPicker = useCallback(() => {
     var _a2;
     (_a2 = avatarFileInputRef.current) == null ? void 0 : _a2.click();
@@ -12328,6 +12412,23 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
         setPhotoPreview(URL.createObjectURL(blob));
       }
       if (Object.keys(payload).length > 0) {
+        const updatedUser = {
+          ...profileUser,
+          reference: payload.reference || profileUser.reference,
+          name: payload.name || profileUser.name,
+          email: payload.email ?? profileUser.email ?? null,
+          ccphone: payload.ccphone || profileUser.ccphone,
+          phone: payload.phone || profileUser.phone,
+          address: payload.address || profileUser.address,
+          town: payload.town || profileUser.town,
+          country: payload.country || profileUser.country,
+          image_url: nextImage || profileUser.image_url,
+          auth_2fa: payload.auth_2fa ?? profileUser.auth_2fa,
+          alias_reference: payload.alias_reference || profileUser.alias_reference,
+          iam_reference: payload.iam_reference || profileUser.iam_reference
+        };
+        setHydratedUser(updatedUser);
+        onUserInfosSync == null ? void 0 : onUserInfosSync({ source: "avatar", user_infos: toUserInfos(updatedUser) });
         onComplete({
           name: payload.name,
           image_url: nextImage || void 0,
@@ -12338,18 +12439,18 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
           town: payload.town || void 0,
           country: payload.country || void 0,
           user_infos: {
-            reference: payload.reference || user.reference,
-            name: payload.name || user.name,
-            email: payload.email ?? user.email ?? null,
-            ccphone: payload.ccphone || user.ccphone,
-            phone: payload.phone || user.phone,
-            address: payload.address || user.address,
-            town: payload.town || user.town,
-            country: payload.country || user.country,
-            image_url: nextImage || user.image_url,
-            auth_2fa: payload.auth_2fa ?? user.auth_2fa,
-            alias_reference: payload.alias_reference || user.alias_reference,
-            iam_reference: payload.iam_reference || user.iam_reference
+            reference: payload.reference || profileUser.reference,
+            name: payload.name || profileUser.name,
+            email: payload.email ?? profileUser.email ?? null,
+            ccphone: payload.ccphone || profileUser.ccphone,
+            phone: payload.phone || profileUser.phone,
+            address: payload.address || profileUser.address,
+            town: payload.town || profileUser.town,
+            country: payload.country || profileUser.country,
+            image_url: nextImage || profileUser.image_url,
+            auth_2fa: payload.auth_2fa ?? profileUser.auth_2fa,
+            alias_reference: payload.alias_reference || profileUser.alias_reference,
+            iam_reference: payload.iam_reference || profileUser.iam_reference
           }
         });
       }
@@ -12359,7 +12460,7 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
     } finally {
       setAvatarUploading(false);
     }
-  }, [onComplete, markSuccess, user.reference, user.name, user.email, user.ccphone, user.phone, user.address, user.town, user.country, user.image_url, user.auth_2fa, user.alias_reference, user.iam_reference]);
+  }, [onComplete, onUserInfosSync, toUserInfos, markSuccess, profileUser.reference, profileUser.name, profileUser.email, profileUser.ccphone, profileUser.phone, profileUser.address, profileUser.town, profileUser.country, profileUser.image_url, profileUser.auth_2fa, profileUser.alias_reference, profileUser.iam_reference]);
   const openContactFlow = useCallback((kind) => {
     setContactFlow({
       kind,
@@ -12367,7 +12468,7 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
       requestId: null,
       method: kind === "email" ? "email" : currentDialCode === "+221" ? "phone" : "email",
       newEmail: "",
-      newCcphone: kind === "phone" ? user.ccphone || "+221" : "+221",
+      newCcphone: kind === "phone" ? profileUser.ccphone || "+221" : "+221",
       newPhone: "",
       oldOtp: "",
       newOtp: "",
@@ -12375,18 +12476,18 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
       error: "",
       resendAvailableAt: null
     });
-  }, [currentDialCode, user.ccphone]);
+  }, [currentDialCode, profileUser.ccphone]);
   const closeContactFlow = useCallback(() => {
     setContactFlow(null);
   }, []);
   const updateFlow = useCallback((patch) => {
     setContactFlow((prev) => prev ? { ...prev, ...patch } : prev);
   }, []);
-  const currentPhoneDialDisplay = user.ccphone || ccphone || "+221";
-  const currentPhoneNumberDisplay = user.phone || phone || "";
-  const currentEmailLabel = user.email || email || "";
+  const currentPhoneDialDisplay = profileUser.ccphone || ccphone || "+221";
+  const currentPhoneNumberDisplay = profileUser.phone || phone || "";
+  const currentEmailLabel = profileUser.email || email || "";
   const currentPhoneDialCode = currentPhoneDialDisplay.trim() || "+221";
-  const currentPhoneDigits = (user.phone || phone || "").replace(/\D/g, "");
+  const currentPhoneDigits = (profileUser.phone || phone || "").replace(/\D/g, "");
   const formatPhoneDisplay = useCallback((dial, digits) => {
     const cleanDial = (dial || "+221").trim() || "+221";
     const cleanDigits = (digits || "").replace(/\D/g, "");
@@ -12442,13 +12543,15 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
       const response = await profileChangeService.verifyNewOTP(contactFlow.requestId, contactFlow.newOtp);
       if (!response.success) throw new Error(response.message || "Code OTP incorrect");
       const updatedUser = {
-        ...user,
+        ...profileUser,
         ...contactFlow.kind === "email" ? { email: contactFlow.newEmail.trim() } : { ccphone: contactFlow.newCcphone, phone: contactFlow.newPhone.trim() }
       };
       if (response.user && typeof response.user === "object") {
         Object.assign(updatedUser, response.user);
       }
+      setHydratedUser(updatedUser);
       setContactFlow(null);
+      onUserInfosSync == null ? void 0 : onUserInfosSync({ source: "contact", user_infos: toUserInfos(updatedUser) });
       onComplete({
         name: updatedUser.name,
         image_url: updatedUser.image_url,
@@ -12474,7 +12577,7 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
     } catch (error) {
       updateFlow({ loading: false, error: error instanceof Error ? error.message : "Code OTP incorrect" });
     }
-  }, [contactFlow, onComplete, updateFlow, user, markSuccess]);
+  }, [contactFlow, onComplete, onUserInfosSync, updateFlow, profileUser, toUserInfos, markSuccess]);
   const resendFlowOtp = useCallback(async () => {
     if (!(contactFlow == null ? void 0 : contactFlow.requestId) || contactFlow.loading) return;
     updateFlow({ loading: true, error: "" });
@@ -12627,7 +12730,7 @@ function OnboardingModal({ open, onOpenChange, onDismiss, user, variant = "missi
                 cursor: avatarUploading ? "not-allowed" : "pointer"
               },
               children: [
-                photoPreview || user.image_url ? /* @__PURE__ */ jsx("img", { src: photoPreview || user.image_url, alt: "Photo de profil", style: { width: "100%", height: "100%", objectFit: "cover" } }) : /* @__PURE__ */ jsx("div", { style: { width: "100%", height: "100%", display: "flex", alignItems: "center", justifyContent: "center", color: C.gray500 }, children: /* @__PURE__ */ jsxs("svg", { width: "22", height: "22", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round", strokeLinejoin: "round", children: [
+                photoPreview || profileUser.image_url ? /* @__PURE__ */ jsx("img", { src: photoPreview || profileUser.image_url, alt: "Photo de profil", style: { width: "100%", height: "100%", objectFit: "cover" } }) : /* @__PURE__ */ jsx("div", { style: { width: "100%", height: "100%", display: "flex", alignItems: "center", justifyContent: "center", color: C.gray500 }, children: /* @__PURE__ */ jsxs("svg", { width: "22", height: "22", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "1.6", strokeLinecap: "round", strokeLinejoin: "round", children: [
                   /* @__PURE__ */ jsx("circle", { cx: "12", cy: "8", r: "4" }),
                   /* @__PURE__ */ jsx("path", { d: "M5.5 21a8.38 8.38 0 0 1 13 0" })
                 ] }) }),
@@ -13804,6 +13907,28 @@ function NativeSSOPage({
     }
     void refreshSessionProfile(true);
   }, [pendingSession, debugOnboardingState, onOnboardingComplete, persistSessionUser, refreshSessionProfile]);
+  const handleOnboardingUserInfosSync = useCallback((payload) => {
+    const activeSession = debugOnboardingState || pendingSession;
+    if (!activeSession) return;
+    const syncedUser = {
+      ...activeSession.sourceUser,
+      ...payload.user_infos
+    };
+    persistSessionUser(activeSession.token, syncedUser);
+    if (debugOnboardingState) {
+      setDebugOnboardingState((prev) => prev ? {
+        ...prev,
+        user: syncedUser,
+        sourceUser: syncedUser
+      } : prev);
+    } else {
+      setPendingSession((prev) => prev ? {
+        ...prev,
+        user: syncedUser,
+        sourceUser: syncedUser
+      } : prev);
+    }
+  }, [debugOnboardingState, pendingSession, persistSessionUser]);
   const handleOnboardingSkip = useCallback(() => {
     const activeSession = debugOnboardingState || pendingSession;
     if (!activeSession) return;
@@ -14011,6 +14136,8 @@ function NativeSSOPage({
           user: (debugOnboardingState || pendingSession).user,
           variant: debugOnboardingState ? "edit" : "missing",
           profileHydrating,
+          hydrateProfile: false,
+          onUserInfosSync: handleOnboardingUserInfosSync,
           onComplete: handleOnboardingComplete,
           onSkip: handleOnboardingSkip
         }
@@ -14090,6 +14217,8 @@ function NativeSSOPage({
         user: (debugOnboardingState || pendingSession).user,
         variant: debugOnboardingState ? "edit" : "missing",
         profileHydrating,
+        hydrateProfile: false,
+        onUserInfosSync: handleOnboardingUserInfosSync,
         onComplete: handleOnboardingComplete,
         onSkip: handleOnboardingSkip
       }