@nibssplc/cams-sdk-react 0.0.1-beta.30 → 0.0.1-beta.32

package/dist/components/CAMSMSALProvider.d.ts

@@ -1,8 +1,16 @@
 import React from 'react';
 import { PublicClientApplication, Configuration } from '@azure/msal-browser';
-export interface CAMSMSALProviderProps {
+import { UseCAMSMSALAuthReturn, UseCAMSMSALAuthOptions } from '../hooks/useCAMSMSALAuth';
+interface CAMSMSALContextValue extends UseCAMSMSALAuthReturn {
+    isAuthenticated: boolean;
+    idToken: string | null;
+    accessToken: string | null;
+}
+export interface CAMSMSALProviderProps extends UseCAMSMSALAuthOptions {
     children: React.ReactNode;
     msalConfig: Configuration;
     msalInstance?: PublicClientApplication;
 }
-export declare function CAMSMSALProvider({ children, msalConfig, msalInstance }: CAMSMSALProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function CAMSMSALProvider(props: CAMSMSALProviderProps): import("react/jsx-runtime").JSX.Element;
+export declare function useCAMSMSALContext(): CAMSMSALContextValue;
+export {};

package/dist/hooks/useCAMSMSALAuth.d.ts

@@ -4,7 +4,7 @@ export interface UseCAMSMSALAuthOptions {
     onAuthError?: (error: CAMSError) => void;
     onTokenExpired?: () => void;
     scopes?: string[];
-    mfaUrl: string;
+    mfaUrl?: string;
     prompt?: string;
 }
 export interface UseCAMSMSALAuthReturn {

package/dist/index.cjs.js

@@ -16719,11 +16719,12 @@ function useCAMSMSALAuth(options) {
     var _d = React__default.useState(null), idToken = _d[0], setIdToken = _d[1];
     var _e = React__default.useState(null), accessToken = _e[0], setAccessToken = _e[1];
     var _f = React__default.useState(false), isMFAPending = _f[0], setIsMFAPending = _f[1];
+    var _g = React__default.useState(false), hasRedirected = _g[0], setHasRedirected = _g[1];
     var isLoading = inProgress !== InteractionStatus.None;
     var isAuthenticated = !!account && !!token && !isMFAPending;
     var scopes = options.scopes || ["openid", "profile", "email"];
     React__default.useEffect(function () {
-        if (account && !isMFAPending) {
+        if (account && !isMFAPending && !hasRedirected) {
             // Get token in foreground popup
             instance
                 .acquireTokenPopup({
@@ -16737,9 +16738,13 @@ function useCAMSMSALAuth(options) {
                 setAccessToken(response.accessToken);
                 setIdToken(response.idToken);
                 setIsMFAPending(true);
-                if (typeof window !== "undefined") {
-                    window.location.href = options.mfaUrl;
-                }
+                setHasRedirected(true);
+                // Small delay to ensure popup closes before redirect
+                setTimeout(function () {
+                    if (typeof window !== "undefined" && process.env.NODE_ENV !== 'test') {
+                        window.location.href = options.mfaUrl;
+                    }
+                }, 100);
                 (_a = options.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(options, response.accessToken);
             })
                 .catch(function (err) {
@@ -16749,7 +16754,7 @@ function useCAMSMSALAuth(options) {
                 (_a = options.onAuthError) === null || _a === void 0 ? void 0 : _a.call(options, camsError);
             });
         }
-    }, [account, instance, isMFAPending]);
+    }, [account, instance, isMFAPending, hasRedirected]);
     var login = React__default.useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
         var err_1, redirectErr_1, camsError_1, camsError;
         var _a, _b, _c;
@@ -16760,7 +16765,7 @@ function useCAMSMSALAuth(options) {
                     _d.label = 1;
                 case 1:
                     _d.trys.push([1, 3, , 8]);
-                    return [4 /*yield*/, instance.loginPopup({
+                    return [4 /*yield*/, instance.loginRedirect({
                             scopes: scopes,
                             prompt: options.prompt || "login",
                         })];
@@ -16808,6 +16813,7 @@ function useCAMSMSALAuth(options) {
                     setToken(null);
                     setError(null);
                     setIsMFAPending(false);
+                    setHasRedirected(false);
                     return [3 /*break*/, 3];
                 case 2:
                     err_2 = _a.sent();
@@ -17253,16 +17259,9 @@ var jsxRuntimeExports = jsxRuntime.exports;
 var CAMSContext = React__default.createContext(null);
 function CAMSProvider(_a) {
     var children = _a.children, defaultConfig = _a.defaultConfig, msalOptions = _a.msalOptions, authOptions = __rest(_a, ["children", "defaultConfig", "msalOptions"]);
-    var _b = React__default.useState(false), mounted = _b[0], setMounted = _b[1];
     var auth = useCAMSAuth(authOptions);
     var msalAuth = useCAMSMSALAuth(msalOptions || { mfaUrl: '/auth/multi-factor' });
-    React__default.useEffect(function () {
-        setMounted(true);
-    }, []);
     var value = React__default.useMemo(function () { return (__assign(__assign({}, auth), { defaultConfig: defaultConfig, isAuthenticated: msalAuth.isAuthenticated, idToken: msalAuth.idToken, accessToken: msalAuth.accessToken })); }, [auth, defaultConfig, msalAuth.isAuthenticated, msalAuth.idToken, msalAuth.accessToken]);
-    if (!mounted) {
-        return jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: children });
-    }
     return (jsxRuntimeExports.jsx(CAMSContext.Provider, { value: value, children: children }));
 }
 function useCAMSContext() {
@@ -17289,10 +17288,48 @@ function ProtectedRoute(_a) {
     return jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, { children: children });
 }
 
-function CAMSMSALProvider(_a) {
-    var children = _a.children, msalConfig = _a.msalConfig, msalInstance = _a.msalInstance;
+var CAMSMSALContext = React__default.createContext(null);
+function CAMSMSALProviderInner(_a) {
+    var children = _a.children, authOptions = __rest(_a, ["children"]);
+    var auth = useCAMSMSALAuth(authOptions);
+    var _b = React__default.useState({
+        isAuthenticated: false,
+        idToken: null,
+        accessToken: null
+    }), persistedAuth = _b[0], setPersistedAuth = _b[1];
+    React__default.useEffect(function () {
+        if (typeof window !== 'undefined') {
+            var stored = localStorage.getItem('cams-msal-auth');
+            if (stored) {
+                setPersistedAuth(JSON.parse(stored));
+            }
+        }
+    }, []);
+    React__default.useEffect(function () {
+        var authState = {
+            isAuthenticated: auth.isAuthenticated,
+            idToken: auth.idToken,
+            accessToken: auth.accessToken
+        };
+        setPersistedAuth(authState);
+        if (typeof window !== 'undefined') {
+            localStorage.setItem('cams-msal-auth', JSON.stringify(authState));
+        }
+    }, [auth.isAuthenticated, auth.idToken, auth.accessToken]);
+    var value = React__default.useMemo(function () { return (__assign(__assign({}, auth), { isAuthenticated: persistedAuth.isAuthenticated, idToken: persistedAuth.idToken, accessToken: persistedAuth.accessToken })); }, [auth, persistedAuth]);
+    return (jsxRuntimeExports.jsx(CAMSMSALContext.Provider, { value: value, children: children }));
+}
+function CAMSMSALProvider(props) {
+    var msalConfig = props.msalConfig, msalInstance = props.msalInstance;
     var instance = msalInstance || new PublicClientApplication(msalConfig);
-    return (jsxRuntimeExports.jsx(MsalProvider, { instance: instance, children: children }));
+    return (jsxRuntimeExports.jsx(MsalProvider, { instance: instance, children: jsxRuntimeExports.jsx(CAMSMSALProviderInner, __assign({}, props)) }));
+}
+function useCAMSMSALContext() {
+    var context = React__default.useContext(CAMSMSALContext);
+    if (!context) {
+        throw new Error('useCAMSMSALContext must be used within a CAMSMSALProvider');
+    }
+    return context;
 }
 
 function ClientOnly(_a) {
@@ -17314,6 +17351,7 @@ exports.ProtectedRoute = ProtectedRoute;
 exports.useCAMSAuth = useCAMSAuth;
 exports.useCAMSContext = useCAMSContext;
 exports.useCAMSMSALAuth = useCAMSMSALAuth;
+exports.useCAMSMSALContext = useCAMSMSALContext;
 Object.keys(camsSdk).forEach(function (k) {
     if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
         enumerable: true,