@nibssplc/cams-sdk-react 1.0.0-rc.51 → 1.0.0-rc.53

package/dist/index.cjs.js

@@ -2412,24 +2412,22 @@ var MFAGate = function (_a) {
     // loginComponent: LoginComponent = DefaultLoginPage,
     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 hasCalledOnAuthSuccess = React.useRef(false);
+    var prevAccessTokenRef = React.useRef("");
     React.useEffect(function () {
         var _a;
-        if (context.authMode === "MSAL" && context.accessToken && context.idToken && !hasCalledOnAuthSuccess.current) {
-            var tokens = {
-                accessToken: context.accessToken,
-                idToken: context.idToken,
-            };
-            onAuthSuccess === null || onAuthSuccess === void 0 ? void 0 : onAuthSuccess(tokens);
-            (_a = context.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(context, tokens);
-            hasCalledOnAuthSuccess.current = true;
-        }
-    }, [context.accessToken, context.idToken, context.authMode, onAuthSuccess, context]);
-    React.useEffect(function () {
-        if (!context.accessToken) {
-            hasCalledOnAuthSuccess.current = false;
+        if (context.authMode === "MSAL") {
+            var accessToken = "accessToken" in context ? context.accessToken : "";
+            var idToken = "idToken" in context ? context.idToken : "";
+            var requiresMFAState = "requiresMFA" in context ? context.requiresMFA : false;
+            // Only call when tokens just arrived (transition from no token to token) and MFA is required
+            if (accessToken && idToken && requiresMFAState && !prevAccessTokenRef.current) {
+                var tokens = { accessToken: accessToken, idToken: idToken };
+                onAuthSuccess === null || onAuthSuccess === void 0 ? void 0 : onAuthSuccess(tokens);
+                (_a = context.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(context, tokens);
+            }
+            prevAccessTokenRef.current = accessToken;
         }
-    }, [context.accessToken]);
+    }, [context, onAuthSuccess]);
     var validatedMFAEndpoints = React.useMemo(function () {
         var parsed = MFAEndpointsSchema.safeParse(MFAEndpoints);
         if (!parsed.success) {
@@ -2450,7 +2448,9 @@ var MFAGate = function (_a) {
                 case 0:
                     if (context.authMode === "MSAL" && context.error) {
                         onAuthError === null || onAuthError === void 0 ? void 0 : onAuthError(context.error);
-                        (_a = context.onAuthError) === null || _a === void 0 ? void 0 : _a.call(context, context.error);
+                        if ("onAuthError" in context) {
+                            (_a = context.onAuthError) === null || _a === void 0 ? void 0 : _a.call(context, context.error);
+                        }
                     }
                     return [4 /*yield*/, context.logout()];
                 case 1:
@@ -2468,8 +2468,9 @@ var MFAGate = function (_a) {
     if (context.isLoading)
         return fallback;
     if (!context.isAuthenticated) {
-        var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : context.requiresMFA;
-        if (shouldRequireMFA && context.accessToken) {
+        var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : ("requiresMFA" in context ? context.requiresMFA : false);
+        var accessToken = "accessToken" in context ? context.accessToken : "";
+        if (shouldRequireMFA && accessToken) {
             return (jsxRuntimeExports.jsx(MFAOptions, { MFAEndpoints: validatedMFAEndpoints, usePassKey: usePassKey, onComplete: handleComplete, onAuthFailed: handleAuthFailed }));
         }
         return (jsxRuntimeExports.jsx(DefaultLoginPage, { usePassKey: usePassKey, useADLogin: useADLogin, MFAEndpoints: MFAEndpoints, PassKeysRegisterProps: PassKeysRegisterProps, CredentialsAuthEndpoint: CredentialsAuthEndpoint }));