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

package/dist/components/MFAGate.d.ts

@@ -15,6 +15,7 @@ interface MFAGateProps {
     CredentialsAuthEndpoint?: string;
     PassKeysRegisterProps?: Record<string, unknown>;
     MFAEndpoints?: MFAEndpoints;
+    requiresMFA?: boolean;
 }
-declare const MFAGate: ({ children, fallback, usePassKey, useADLogin, CredentialsAuthEndpoint, PassKeysRegisterProps, MFAEndpoints, }: MFAGateProps) => string | number | bigint | boolean | Iterable<import("react").ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<import("react").ReactNode> | null | undefined> | import("react/jsx-runtime").JSX.Element | null;
+declare const MFAGate: ({ children, fallback, usePassKey, useADLogin, CredentialsAuthEndpoint, PassKeysRegisterProps, MFAEndpoints, requiresMFA, }: MFAGateProps) => string | number | bigint | boolean | Iterable<import("react").ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<import("react").ReactNode> | null | undefined> | import("react/jsx-runtime").JSX.Element | null;
 export default MFAGate;

package/dist/components/UnifiedCAMSProvider.d.ts

@@ -14,6 +14,11 @@ interface MSALProviderProps extends BaseProviderProps, Omit<UseCAMSMSALAuthOptio
     mode: "MSAL";
     msalConfig: Configuration;
     msalInstance?: PublicClientApplication;
+    onAuthSuccess?: (tokens: {
+        accessToken: string;
+        idToken: string;
+    }) => void;
+    onAuthError?: (error: any) => void;
 }
 type UnifiedCAMSProviderProps = RegularProviderProps | MSALProviderProps;
 export declare function UnifiedCAMSProvider(props: UnifiedCAMSProviderProps): import("react/jsx-runtime").JSX.Element;

package/dist/context/CAMSContext.d.ts

@@ -12,6 +12,11 @@ interface RegularCAMSContextValue extends BaseCAMSContextValue, UseCAMSAuthRetur
 }
 interface MSALCAMSContextValue extends BaseCAMSContextValue, UseCAMSMSALAuthReturn {
     authMode: "MSAL";
+    onAuthSuccess?: (tokens: {
+        accessToken: string;
+        idToken: string;
+    }) => void;
+    onAuthError?: (error: any) => void;
 }
 export type CAMSContextValue = RegularCAMSContextValue | MSALCAMSContextValue;
 export declare const CAMSContext: import("react").Context<CAMSContextValue | null>;

package/dist/hooks/useCAMSMSALAuth.d.ts

@@ -1,11 +1,6 @@
 import "../utils/crypto-polyfill";
 import { CAMSError, CAMSMFAAuthenticator, MFAResponse } from "@nibssplc/cams-sdk";
 export interface UseCAMSMSALAuthOptions {
-    onAuthSuccess?: (tokens: {
-        accessToken: string;
-        idToken: string;
-    }) => void;
-    onAuthError?: (error: CAMSError) => void;
     onTokenExpired?: () => void;
     scopes?: string[];
     storageKey?: string;

package/dist/index.cjs.js

@@ -434,7 +434,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 = msalReact.useMsal(), instance = _b.instance, inProgress = _b.inProgress, accounts = _b.accounts;
     var account = msalReact.useAccount(accounts[0] || {});
@@ -563,10 +563,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();
@@ -586,12 +582,10 @@ function useCAMSMSALAuth(options) {
                         ((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.includes("popup"))) {
                         camsError_1 = new camsSdk.CAMSError(camsSdk.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 camsSdk.CAMSError(camsSdk.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*/];
             }
@@ -602,8 +596,6 @@ function useCAMSMSALAuth(options) {
         prompt,
         appCode,
         MFAEndpoint,
-        onAuthSuccess,
-        onAuthError,
         storageKey,
         inProgress,
     ]);
@@ -1496,8 +1488,8 @@ function CAMSProviderCore(props) {
     ]);
     var value = React.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) {
@@ -2418,7 +2410,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;
     var context = useCAMSContext();
     var validatedMFAEndpoints = React.useMemo(function () {
         var parsed = MFAEndpointsSchema.safeParse(MFAEndpoints);
@@ -2429,19 +2421,32 @@ var MFAGate = function (_a) {
         return parsed.data;
     }, [MFAEndpoints]);
     var handleComplete = React.useCallback(function (success) {
-        if (!success)
+        var _a;
+        if (success && context.authMode === "MSAL") {
+            (_a = context.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(context, {
+                accessToken: context.accessToken,
+                idToken: context.idToken,
+            });
+        }
+        else if (!success) {
             camsSdk.Logger.error("MFA authentication failed");
-    }, []);
+        }
+    }, [context]);
     var handleAuthFailed = React.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) {
+                        (_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]);
     if (useADLogin && !CredentialsAuthEndpoint)
         return jsxRuntimeExports.jsx(ErrorFallback, { message: "Invalid AD Login Configuration." });
     if (!validatedMFAEndpoints)
@@ -2450,7 +2455,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) {