@nibssplc/cams-sdk-react 1.0.0-rc.87 → 1.0.0-rc.89

package/dist/index.cjs.js

@@ -479,14 +479,10 @@ function useCAMSMSALAuth(options) {
                 }
                 catch (_b) { }
             }
-            else if (account) {
-                // Storage cleared but MSAL account exists - clear MSAL state
-                instance.logoutRedirect().catch(function () { });
-            }
         }
     }, [accessToken, account, instance, options.storageKey]);
     var login = React.useCallback(function () { return __awaiter$1(_this, void 0, void 0, function () {
-        var response, mfaConfig, authenticator, userConfig, camsError, err_1, camsError_1, camsError;
+        var response, authenticator, userConfig, camsError, err_1, camsError_1, camsError;
         var _a;
         return __generator$1(this, function (_b) {
             switch (_b.label) {
@@ -505,33 +501,28 @@ function useCAMSMSALAuth(options) {
                         })];
                 case 2:
                     response = _b.sent();
-                    mfaConfig = {
-                        accessToken: response.accessToken,
-                        idToken: response.idToken,
-                        provider: "MSAL",
-                        APIAuthEndpoint: ValidateUserEndpoint,
-                    };
                     authenticator = new camsSdk.CAMSMFAAuthenticator();
                     setIsFetchingMFAConfig(true);
-                    return [4 /*yield*/, authenticator.GetUserMFAConfig(mfaConfig)];
+                    return [4 /*yield*/, authenticator.GetUserMFAConfig({
+                            accessToken: response.accessToken,
+                            idToken: response.idToken,
+                            provider: "MSAL",
+                            APIAuthEndpoint: ValidateUserEndpoint,
+                        })];
                 case 3:
                     userConfig = _b.sent();
                     setIsFetchingMFAConfig(false);
-                    console.log("CAMS MFA Authenticator initialized:", {
-                        mfaConfig: mfaConfig,
+                    camsSdk.Logger.info("CAMS MFA Authenticator initialized. MSAL User Auth is Completed...", {
                         userConfig: userConfig,
+                        storageKey: storageKey,
+                        email: userConfig.userInfo.email,
                     });
-                    camsSdk.Logger.info("MSAL User Auth is Completed");
                     // Don't persist as authenticated until MFA is complete
                     if (userConfig.isValid && userConfig.userInfo.email) {
-                        camsSdk.Logger.info("MSAL User Auth is Completed...", {
-                            storageKey: storageKey,
-                            email: userConfig.userInfo.email,
-                        });
                         setAccessToken(response.accessToken);
                         setIdToken(response.idToken);
                         localStorage.setItem(storageKey, JSON.stringify({
-                            isAuthenticated: false,
+                            isAuthenticated: !userConfig.userInfo.isMFAEnabled,
                             requiresMFA: userConfig.userInfo.isMFAEnabled,
                             accessToken: response.accessToken,
                             idToken: response.idToken,
@@ -636,17 +627,17 @@ function useCAMSMSALAuth(options) {
                 case 0:
                     _a.trys.push([0, 2, , 3]);
                     camsSdk.Logger.info("Logging User Out");
-                    return [4 /*yield*/, instance.logoutRedirect()];
-                case 1:
-                    _a.sent();
                     setAccessToken("");
                     setIdToken("");
                     setError(null);
                     setRequiresMFA(false);
                     if (typeof window !== "undefined") {
                         localStorage.removeItem(storageKey);
-                        // deleteCookie("CAMS-MSAL-AUTH-SDK-PROFILE");
+                        deleteCookie(storageKey + "-PROFILE");
                     }
+                    return [4 /*yield*/, instance.logoutRedirect()];
+                case 1:
+                    _a.sent();
                     return [3 /*break*/, 3];
                 case 2:
                     err_2 = _a.sent();
@@ -1563,7 +1554,7 @@ var MFAOptions = function (_a) {
     var _f = React.useState(false), showSuccessAnimation = _f[0], setShowSuccessAnimation = _f[1];
     var _g = React.useState(null), authType = _g[0], setAuthType = _g[1];
     var context = useCAMSContext();
-    var _h = context.authMode === "MSAL" && "AuthenticatorCode" in context
+    var _h = context.authMode === "MSAL" && "EmailOTP" in context
         ? context
         : { completeMFA: null, logout: function () { return __awaiter$1(void 0, void 0, void 0, function () { return __generator$1(this, function (_a) {
                 return [2 /*return*/];
@@ -1862,8 +1853,6 @@ var MFAGate = function (_a) {
                     (_a = context.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(context, tokens);
                 }
             }
-            // Force state update after MFA completion
-            setAuthState("Authenticated");
         }
         else if (!success) {
             camsSdk.Logger.error("MFA authentication failed", { context: context || null });
@@ -1888,59 +1877,21 @@ var MFAGate = function (_a) {
         });
     }); }, [context, onAuthError]);
     React.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;
         }
-        // Check if user has accessToken (MSAL authenticated)
         if (!contextAccessToken) {
             setAuthState("Unauthenticated");
             return;
         }
-        // User has accessToken, determine if MFA is required
         var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : contextRequiresMFA;
-        console.log("MFA decision:", {
-            shouldRequireMFA: shouldRequireMFA,
-            hasAccessToken: !!contextAccessToken,
-            finalState: shouldRequireMFA ? "MFA_Required" : "Authenticated",
-        });
-        if (shouldRequireMFA) {
-            setAuthState("MFA_Required");
-        }
-        else {
-            setAuthState("Authenticated");
-        }
+        setAuthState(shouldRequireMFA ? "MFA_Required" : "Authenticated");
     }, [
         context.isLoading,
-        context.isAuthenticated,
-        contextRequiresMFA, // Now this will trigger re-evaluation when requiresMFA changes
-        contextAccessToken, // And this when accessToken changes
-        requiresMFA,
-        context.authMode,
-    ]);
-    // Debug useEffect
-    React.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,
+        requiresMFA,
     ]);
     if (useADLogin && !CredentialsAuthEndpoint)
         return jsxRuntime.jsx(ErrorFallback, { message: "Invalid AD Login Configuration." });