@nibssplc/cams-sdk-react 1.0.0-rc.47 → 1.0.0-rc.49

package/dist/index.esm.js

@@ -413,7 +413,7 @@ var deleteCookie = function (name) {
 
 function useCAMSMSALAuth(options) {
     var _this = this;
-    var optStorageKey = options.storageKey, optScopes = options.scopes, prompt = options.prompt, appCode = options.appCode, MFAEndpoint = options.MFAEndpoint, onAuthSuccess = options.onAuthSuccess, onAuthError = options.onAuthError, _a = options.activeCookiePeriod, activeCookiePeriod = _a === void 0 ? 1 : _a;
+    var optStorageKey = options.storageKey, optScopes = options.scopes, prompt = options.prompt, appCode = options.appCode, MFAEndpoint = options.MFAEndpoint, _a = options.activeCookiePeriod, activeCookiePeriod = _a === void 0 ? 1 : _a;
     var storageKey = optStorageKey || "CAMS-MSAL-AUTH-SDK";
     var _b = useMsal(), instance = _b.instance, inProgress = _b.inProgress, accounts = _b.accounts;
     var account = useAccount(accounts[0] || {});
@@ -542,10 +542,6 @@ function useCAMSMSALAuth(options) {
                             idToken: response.idToken,
                         }));
                     }
-                    onAuthSuccess === null || onAuthSuccess === void 0 ? void 0 : onAuthSuccess({
-                        accessToken: response.accessToken,
-                        idToken: response.idToken,
-                    });
                     return [3 /*break*/, 4];
                 case 3:
                     err_1 = _b.sent();
@@ -565,12 +561,10 @@ function useCAMSMSALAuth(options) {
                         ((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.includes("popup"))) {
                         camsError_1 = new CAMSError(CAMSErrorType.POPUP_BLOCKED, "Popup blocked by browser. Please allow popups and try again.");
                         setError(camsError_1);
-                        onAuthError === null || onAuthError === void 0 ? void 0 : onAuthError(camsError_1);
                         return [2 /*return*/];
                     }
                     camsError = new CAMSError(CAMSErrorType.API_VALIDATION_ERROR, "Login failed: " + err_1.message || err_1);
                     setError(camsError);
-                    onAuthError === null || onAuthError === void 0 ? void 0 : onAuthError(camsError);
                     return [3 /*break*/, 4];
                 case 4: return [2 /*return*/];
             }
@@ -581,8 +575,6 @@ function useCAMSMSALAuth(options) {
         prompt,
         appCode,
         MFAEndpoint,
-        onAuthSuccess,
-        onAuthError,
         storageKey,
         inProgress,
     ]);
@@ -1475,8 +1467,8 @@ function CAMSProviderCore(props) {
     ]);
     var value = useMemo(function () {
         auth.logout; var authRest = __rest(auth, ["logout"]);
-        return __assign(__assign({}, authRest), { logout: enhancedLogout, userProfile: userProfile, setUserProfile: setUserProfile, authMode: mode });
-    }, [auth, userProfile, mode]);
+        return __assign(__assign({}, authRest), { logout: enhancedLogout, userProfile: userProfile, setUserProfile: setUserProfile, authMode: mode, onAuthSuccess: mode === "MSAL" ? props.onAuthSuccess : undefined, onAuthError: mode === "MSAL" ? props.onAuthError : undefined });
+    }, [auth, userProfile, mode, props]);
     return jsxRuntimeExports.jsx(CAMSContext.Provider, { value: value, children: children });
 }
 function UnifiedCAMSProvider(props) {
@@ -2397,7 +2389,7 @@ var MFAGate = function (_a) {
     // loginComponent: LoginComponent = DefaultLoginPage,
     _c = _a.usePassKey, 
     // 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;
+    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 validatedMFAEndpoints = useMemo(function () {
         var parsed = MFAEndpointsSchema.safeParse(MFAEndpoints);
@@ -2408,19 +2400,35 @@ var MFAGate = function (_a) {
         return parsed.data;
     }, [MFAEndpoints]);
     var handleComplete = useCallback(function (success) {
-        if (!success)
+        var _a;
+        if (success && context.authMode === "MSAL") {
+            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);
+        }
+        else if (!success) {
             Logger.error("MFA authentication failed");
-    }, []);
+        }
+    }, [context, onAuthSuccess]);
     var handleAuthFailed = useCallback(function () { return __awaiter$1(void 0, void 0, void 0, function () {
-        return __generator$1(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, context.logout()];
+        var _a;
+        return __generator$1(this, function (_b) {
+            switch (_b.label) {
+                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);
+                    }
+                    return [4 /*yield*/, context.logout()];
                 case 1:
-                    _a.sent();
+                    _b.sent();
                     return [2 /*return*/];
             }
         });
-    }); }, [context.logout]);
+    }); }, [context, onAuthError]);
     if (useADLogin && !CredentialsAuthEndpoint)
         return jsxRuntimeExports.jsx(ErrorFallback, { message: "Invalid AD Login Configuration." });
     if (!validatedMFAEndpoints)
@@ -2429,7 +2437,8 @@ var MFAGate = function (_a) {
         return jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: children });
     if (context.isLoading)
         return fallback;
-    if (context.requiresMFA) {
+    var shouldRequireMFA = requiresMFA !== null && requiresMFA !== void 0 ? requiresMFA : context.requiresMFA;
+    if (shouldRequireMFA) {
         return (jsxRuntimeExports.jsx(MFAOptions, { MFAEndpoints: validatedMFAEndpoints, usePassKey: usePassKey, onComplete: handleComplete, onAuthFailed: handleAuthFailed }));
     }
     if (!context.isAuthenticated) {