@nibssplc/cams-sdk-react 1.0.0-rc.80 → 1.0.0-rc.82

package/dist/index.esm.js

@@ -499,8 +499,6 @@ function useCAMSMSALAuth(options) {
                         mfaConfig: mfaConfig,
                         userConfig: userConfig,
                     });
-                    setAccessToken(response.accessToken);
-                    setIdToken(response.idToken);
                     Logger.info("MSAL User Auth is Completed");
                     // Don't persist as authenticated until MFA is complete
                     if (userConfig.isValid && userConfig.userInfo.email) {
@@ -508,6 +506,8 @@ function useCAMSMSALAuth(options) {
                             storageKey: storageKey,
                             email: userConfig.userInfo.email,
                         });
+                        setAccessToken(response.accessToken);
+                        setIdToken(response.idToken);
                         localStorage.setItem(storageKey, JSON.stringify({
                             isAuthenticated: false,
                             requiresMFA: userConfig.userInfo.isMFAEnabled,
@@ -1795,14 +1795,13 @@ var MFAEndpointsSchema = z$1.object({
     AuthChallengeVerify: z$1.url("MFA AuthChallengeVerify must be a valid URL"),
 });
 var MFAGate = function (_a) {
-    var _b, _c, _d;
-    var children = _a.children, _e = _a.fallback, fallback = _e === void 0 ? (jsx("div", { className: "h-screen flex items-center justify-center", children: jsx(LoadingSpinner, {}) })) : _e, 
+    var children = _a.children, _b = _a.fallback, fallback = _b === void 0 ? (jsx("div", { className: "h-screen flex items-center justify-center", children: jsx(LoadingSpinner, {}) })) : _b, 
     // loginComponent: LoginComponent = DefaultLoginPage,
-    _f = _a.usePassKey, 
+    _c = _a.usePassKey, 
     // loginComponent: LoginComponent = DefaultLoginPage,
-    usePassKey = _f === void 0 ? false : _f, _g = _a.useADLogin, useADLogin = _g === void 0 ? false : _g, CredentialsAuthEndpoint = _a.CredentialsAuthEndpoint, PassKeysRegisterProps = _a.PassKeysRegisterProps, MFAEndpoints = _a.MFAEndpoints, requiresMFA = _a.requiresMFA, onAuthSuccess = _a.onAuthSuccess, onAuthError = _a.onAuthError;
+    usePassKey = _c === void 0 ? false : _c, _d = _a.useADLogin, useADLogin = _d === void 0 ? false : _d, CredentialsAuthEndpoint = _a.CredentialsAuthEndpoint, PassKeysRegisterProps = _a.PassKeysRegisterProps, MFAEndpoints = _a.MFAEndpoints, requiresMFA = _a.requiresMFA, onAuthSuccess = _a.onAuthSuccess, onAuthError = _a.onAuthError;
     var context = useCAMSContext();
-    var _h = useState("Loading"), authState = _h[0], setAuthState = _h[1];
+    var _e = useState("Loading"), authState = _e[0], setAuthState = _e[1];
     var validatedMFAEndpoints = useMemo(function () {
         var parsed = MFAEndpointsSchema.safeParse(MFAEndpoints);
         if (!parsed.success) {
@@ -1811,6 +1810,9 @@ var MFAGate = function (_a) {
         }
         return parsed.data;
     }, [MFAEndpoints]);
+    // Extract the specific values we need from context for dependencies
+    var contextRequiresMFA = "requiresMFA" in context ? context.requiresMFA : false;
+    var contextAccessToken = "accessToken" in context ? context.accessToken : "";
     var handleComplete = useCallback(function (success) {
         var _a;
         if (success && context.authMode === "MSAL") {
@@ -1846,12 +1848,14 @@ var MFAGate = function (_a) {
             }
         });
     }); }, [context, onAuthError]);
-    Logger.debug("User context:", {
-        user: context.user,
-        profile: (_b = context.user) === null || _b === void 0 ? void 0 : _b.profile,
-        email: (_d = (_c = context.user) === null || _c === void 0 ? void 0 : _c.profile) === null || _d === void 0 ? void 0 : _d.email,
-    });
     useEffect(function () {
+        console.log("Auth evaluation triggered:", {
+            isLoading: context.isLoading,
+            isAuthenticated: context.isAuthenticated,
+            contextRequiresMFA: contextRequiresMFA,
+            contextAccessToken: !!contextAccessToken,
+            requiresMFA: requiresMFA,
+        });
         if (context.isLoading) {
             setAuthState("Loading");
             return;
@@ -1860,26 +1864,44 @@ var MFAGate = function (_a) {
             setAuthState("Unauthenticated");
             return;
         }
-        // Small delay to ensure all context updates are processed
-        var timer = setTimeout(function () {
-            var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : ("requiresMFA" in context ? context.requiresMFA : false);
-            var accessToken = "accessToken" in context ? context.accessToken : "";
-            console.log(shouldRequireMFA, "Auth State", authState, context);
-            if (shouldRequireMFA && accessToken) {
-                setAuthState("MFA_Required");
-            }
-            else {
-                setAuthState("Authenticated");
-            }
-        }, 50);
-        return function () { return clearTimeout(timer); };
+        // If authenticated, determine if MFA is required
+        var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : contextRequiresMFA;
+        console.log("MFA decision:", {
+            shouldRequireMFA: shouldRequireMFA,
+            hasAccessToken: !!contextAccessToken,
+            finalState: shouldRequireMFA && contextAccessToken
+                ? "MFA_Required"
+                : "Authenticated",
+        });
+        if (shouldRequireMFA && contextAccessToken) {
+            setAuthState("MFA_Required");
+        }
+        else {
+            setAuthState("Authenticated");
+        }
     }, [
-        context.accessToken,
         context.isLoading,
         context.isAuthenticated,
-        context.requiresMFA,
+        contextRequiresMFA, // Now this will trigger re-evaluation when requiresMFA changes
+        contextAccessToken, // And this when accessToken changes
         requiresMFA,
-        context,
+    ]);
+    // Debug useEffect
+    useEffect(function () {
+        console.log("Current authState:", authState);
+        console.log("Context state:", {
+            isLoading: context.isLoading,
+            isAuthenticated: context.isAuthenticated,
+            authMode: context.authMode,
+            requiresMFA: contextRequiresMFA,
+            hasAccessToken: !!contextAccessToken,
+        });
+    }, [
+        authState,
+        context.isLoading,
+        context.isAuthenticated,
+        contextRequiresMFA,
+        contextAccessToken,
     ]);
     if (useADLogin && !CredentialsAuthEndpoint)
         return jsx(ErrorFallback, { message: "Invalid AD Login Configuration." });