@nibssplc/cams-sdk-react 1.0.0-rc.100 → 1.0.0-rc.102

package/dist/index.esm.js

@@ -422,8 +422,11 @@ function useCAMSMSALAuth(options) {
     var _f = useState(""), email = _f[0], setEmail = _f[1];
     var _g = useState(false), requiresMFA = _g[0], setRequiresMFA = _g[1];
     var _h = useState(false), isFetchingMFAConfig = _h[0], setIsFetchingMFAConfig = _h[1];
+    var _j = useState(false), isAuthenticated = _j[0], setIsAuthenticated = _j[1];
     var isLoading = inProgress !== InteractionStatus.None || isFetchingMFAConfig;
-    var isAuthenticated = !!account && !!accessToken;
+    useEffect(function () {
+        setIsAuthenticated(!!account && !!accessToken && !requiresMFA);
+    }, [account, accessToken, requiresMFA]);
     var scopes = optScopes || ["openid", "profile", "email"];
     var isTokenValid = function (token) {
         try {
@@ -589,7 +592,7 @@ function useCAMSMSALAuth(options) {
                         profile: __assign({}, data),
                     }), activeCookiePeriod);
                     setRequiresMFA(false);
-                    // Set requiresMFA to false after storage update
+                    setIsAuthenticated(true);
                     Logger.debug("MFA completed successfully, storage updated", {
                         accessToken: accessToken,
                         idToken: idToken,
@@ -629,6 +632,7 @@ function useCAMSMSALAuth(options) {
                     setIdToken("");
                     setError(null);
                     setRequiresMFA(false);
+                    setIsAuthenticated(false);
                     if (typeof window !== "undefined") {
                         localStorage.removeItem(storageKey);
                         deleteCookie(storageKey + "-PROFILE");
@@ -961,7 +965,7 @@ function CAMSProviderCore(props) {
     var children = props.children, mode = props.mode, appCode = props.appCode;
     // Always call both hooks to satisfy Rules of Hooks
     var regularAuth = useCAMSAuth(mode === "REGULAR"
-        ? __assign(__assign({}, props), { appCode: appCode })
+        ? __assign(__assign({}, props), { appCode: appCode, idleTimeout: 0 })
         : { appCode: "" });
     var msalAuth = useCAMSMSALAuth(mode === "MSAL"
         ? __assign(__assign({}, props), { appCode: appCode, ValidateUserEndpoint: props.ValidateUserEndpoint, activeCookiePeriod: 1 })
@@ -1551,9 +1555,11 @@ var MFAOptions = function (_a) {
     var _f = useState(false), showSuccessAnimation = _f[0], setShowSuccessAnimation = _f[1];
     var _g = useState(null), authType = _g[0], setAuthType = _g[1];
     var context = useCAMSContext();
-    var _h = context.authMode === "MSAL" && "EmailOTP" in context
+    var _h = context.authMode === "MSAL"
         ? context
-        : { completeMFA: null, logout: function () { return __awaiter$1(void 0, void 0, void 0, function () { return __generator$1(this, function (_a) {
+        : { completeMFA: function (data) { return __awaiter$1(void 0, void 0, void 0, function () { return __generator$1(this, function (_a) {
+                return [2 /*return*/, data];
+            }); }); }, logout: function () { return __awaiter$1(void 0, void 0, void 0, function () { return __generator$1(this, function (_a) {
                 return [2 /*return*/];
             }); }); } }, completeMFA = _h.completeMFA, logout = _h.logout;
     var authenticate = useWebAuthn().authenticate;
@@ -1570,7 +1576,7 @@ var MFAOptions = function (_a) {
                         if (!(state && (data === null || data === void 0 ? void 0 : data.isValid))) return [3 /*break*/, 2];
                         // Call completeMFA to update context state
                         console.log("IN Complete MFA Block. Handling MFA", data);
-                        return [4 /*yield*/, (completeMFA === null || completeMFA === void 0 ? void 0 : completeMFA(data))];
+                        return [4 /*yield*/, completeMFA(data)];
                     case 1:
                         _a.sent();
                         context.setUserProfile({
@@ -1754,15 +1760,9 @@ var DefaultLoginPage = function (_a) {
                 }));
                 context.setUserProfile({
                     state: "AUTH_SUCCESS",
-                    message: data.message,
+                    message: (data === null || data === void 0 ? void 0 : data.message) || "Authentication Successful",
                     role: data.userInfo.role,
-                    profile: {
-                        id: data.userInfo.id,
-                        name: data.userInfo.name,
-                        email: data.userInfo.email,
-                        isMFAEnabled: data.userInfo.isMFAEnabled,
-                        tokens: data.tokens,
-                    },
+                    profile: __assign(__assign({}, data.userInfo), { tokens: __assign({}, data.tokens) }),
                 });
                 setShowADModal(false);
             }
@@ -1847,8 +1847,7 @@ var MFAGate = function (_a) {
         if (success) {
             var accessToken = "accessToken" in context ? context.accessToken : "";
             var idToken = "idToken" in context ? context.idToken : "";
-            Logger.info("MFA Authentication Successful", { context: context || null });
-            context.isAuthenticated = true;
+            Logger.info("MFA Authentication Successful");
             setAuthState("Authenticated");
             if (context.authMode === "MSAL") {
                 var tokens = { accessToken: accessToken, idToken: idToken };
@@ -1858,8 +1857,8 @@ var MFAGate = function (_a) {
                 }
             }
         }
-        else if (!success) {
-            Logger.error("MFA Authentication Failed", { context: context || null });
+        else {
+            Logger.error("MFA Authentication Failed");
         }
     }, [context, onAuthSuccess]);
     var handleAuthFailed = useCallback(function () { return __awaiter$1(void 0, void 0, void 0, function () {
@@ -1912,10 +1911,7 @@ var MFAGate = function (_a) {
             return jsx(Fragment, { children: children });
         case "Unauthenticated":
         default:
-            return (jsx(DefaultLoginPage, { usePassKey: usePassKey, useADLogin: useADLogin, MFAEndpoints: ValidatedMFAEndpoints, PassKeysRegisterProps: PassKeysRegisterProps, CredentialsAuthEndpoint: CredentialsAuthEndpoint, onADLoginSuccess: function () {
-                    context.isAuthenticated = true;
-                    setAuthState("Authenticated");
-                } }));
+            return (jsx(DefaultLoginPage, { usePassKey: usePassKey, useADLogin: useADLogin, MFAEndpoints: ValidatedMFAEndpoints, PassKeysRegisterProps: PassKeysRegisterProps, CredentialsAuthEndpoint: CredentialsAuthEndpoint, onADLoginSuccess: function () { return setAuthState("Authenticated"); } }));
     }
 };