@nibssplc/cams-sdk-react 1.0.0-rc.86 → 1.0.0-rc.88

package/dist/index.cjs.js

@@ -479,10 +479,6 @@ 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 () {
@@ -501,7 +497,7 @@ function useCAMSMSALAuth(options) {
                     _b.trys.push([1, 4, , 5]);
                     return [4 /*yield*/, instance.loginPopup({
                             scopes: scopes,
-                            prompt: prompt || "login",
+                            prompt: prompt || "select_account",
                         })];
                 case 2:
                     response = _b.sent();
@@ -531,7 +527,7 @@ function useCAMSMSALAuth(options) {
                         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,9 +632,6 @@ 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);
@@ -647,6 +640,9 @@ function useCAMSMSALAuth(options) {
                         localStorage.removeItem(storageKey);
                         // deleteCookie("CAMS-MSAL-AUTH-SDK-PROFILE");
                     }
+                    return [4 /*yield*/, instance.logoutRedirect()];
+                case 1:
+                    _a.sent();
                     return [3 /*break*/, 3];
                 case 2:
                     err_2 = _a.sent();
@@ -1563,7 +1559,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*/];
@@ -1858,6 +1854,7 @@ var MFAGate = function (_a) {
                 var tokens = { accessToken: accessToken, idToken: idToken };
                 onAuthSuccess === null || onAuthSuccess === void 0 ? void 0 : onAuthSuccess(tokens);
                 if ("onAuthSuccess" in context) {
+                    context.isAuthenticated = true;
                     (_a = context.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(context, tokens);
                 }
             }
@@ -1956,7 +1953,10 @@ var MFAGate = function (_a) {
             return jsxRuntime.jsx(jsxRuntime.Fragment, { children: children });
         case "Unauthenticated":
         default:
-            return (jsxRuntime.jsx(DefaultLoginPage, { usePassKey: usePassKey, useADLogin: useADLogin, MFAEndpoints: ValidatedMFAEndpoints, PassKeysRegisterProps: PassKeysRegisterProps, CredentialsAuthEndpoint: CredentialsAuthEndpoint, onADLoginSuccess: function () { return setAuthState("Authenticated"); } }));
+            return (jsxRuntime.jsx(DefaultLoginPage, { usePassKey: usePassKey, useADLogin: useADLogin, MFAEndpoints: ValidatedMFAEndpoints, PassKeysRegisterProps: PassKeysRegisterProps, CredentialsAuthEndpoint: CredentialsAuthEndpoint, onADLoginSuccess: function () {
+                    context.isAuthenticated = true;
+                    setAuthState("Authenticated");
+                } }));
     }
 };