@nibssplc/cams-sdk-react 0.0.1-beta.33 → 0.0.1-beta.35

package/dist/components/CAMSMSALProvider.d.ts

@@ -2,9 +2,6 @@ import React from 'react';
 import { PublicClientApplication, Configuration } from '@azure/msal-browser';
 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;

package/dist/index.cjs.js

@@ -16721,63 +16721,118 @@ function useCAMSMSALAuth(options) {
     var isLoading = inProgress !== InteractionStatus.None;
     var isAuthenticated = !!account && !!token;
     var scopes = options.scopes || ["openid", "profile", "email"];
+    var isTokenValid = function (token) {
+        try {
+            var payload = JSON.parse(atob(token.split('.')[1]));
+            return payload.exp * 1000 > Date.now();
+        }
+        catch (_a) {
+            return false;
+        }
+    };
+    React__default.useEffect(function () {
+        if (typeof window !== 'undefined' && !token) {
+            var stored = localStorage.getItem('cams-msal-auth');
+            if (stored) {
+                try {
+                    var _a = JSON.parse(stored), accessToken_1 = _a.accessToken, idToken_1 = _a.idToken;
+                    if (accessToken_1 && isTokenValid(accessToken_1)) {
+                        setToken(accessToken_1);
+                        setAccessToken(accessToken_1);
+                        setIdToken(idToken_1);
+                    }
+                    else {
+                        localStorage.removeItem('cams-msal-auth');
+                    }
+                }
+                catch (_b) { }
+            }
+        }
+    }, [token]);
+    // useEffect(() => {
+    //   const handleRedirect = async () => {
+    //     try {
+    //       const response = await instance.handleRedirectPromise();
+    //       if (response) {
+    //         const account = response.account;
+    //         instance.setActiveAccount(account);
+    //         const tokenResponse = await instance.acquireTokenSilent({
+    //           scopes,
+    //           account,
+    //         });
+    //         setToken(tokenResponse.accessToken);
+    //         setAccessToken(tokenResponse.accessToken);
+    //         setIdToken(tokenResponse.idToken);
+    //         options.onAuthSuccess?.(tokenResponse.accessToken);
+    //         if (
+    //           typeof window !== "undefined" &&
+    //           process.env.NODE_ENV !== "test"
+    //         ) {
+    //           window.location.href = options.mfaUrl!;
+    //         }
+    //       }
+    //     } catch (err) {
+    //       console.error("Redirect handling failed:", err);
+    //     }
+    //   };
+    //   handleRedirect();
+    // }, []);
     var login = React__default.useCallback(function () { return __awaiter(_this, void 0, void 0, function () {
-        var loginResponse, tokenResponse, err_1, redirectErr_1, camsError_1, camsError;
-        var _a, _b, _c, _d;
-        return __generator(this, function (_e) {
-            switch (_e.label) {
+        var err_1, camsError_1, camsError;
+        var _a, _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
                 case 0:
                     setError(null);
-                    _e.label = 1;
+                    _d.label = 1;
                 case 1:
-                    _e.trys.push([1, 4, , 9]);
-                    return [4 /*yield*/, instance.loginPopup({
+                    _d.trys.push([1, 3, , 4]);
+                    // await instance.loginRedirect({
+                    //   scopes,
+                    //   prompt: options.prompt || "login",
+                    // });
+                    return [4 /*yield*/, instance
+                            .loginPopup({
                             scopes: scopes,
                             prompt: options.prompt || "login",
+                        })
+                            .then(function (response) {
+                            var _a;
+                            camsSdk.Logger.debug("Login Token response:", {
+                                accessToken: accessToken,
+                                idToken: idToken
+                            });
+                            setToken(response.accessToken);
+                            setAccessToken(response.accessToken);
+                            setIdToken(response.idToken);
+                            (_a = options.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(options, response.accessToken);
+                            if (typeof window !== "undefined" &&
+                                process.env.NODE_ENV !== "test") {
+                                window.location.href = options.mfaUrl;
+                            }
                         })];
                 case 2:
-                    loginResponse = _e.sent();
-                    return [4 /*yield*/, instance.acquireTokenPopup({
-                            scopes: scopes,
-                            account: loginResponse.account,
-                            prompt: options.prompt || "login",
-                        })];
+                    // await instance.loginRedirect({
+                    //   scopes,
+                    //   prompt: options.prompt || "login",
+                    // });
+                    _d.sent();
+                    return [3 /*break*/, 4];
                 case 3:
-                    tokenResponse = _e.sent();
-                    setToken(tokenResponse.accessToken);
-                    setAccessToken(tokenResponse.accessToken);
-                    setIdToken(tokenResponse.idToken);
-                    if (typeof window !== "undefined" && process.env.NODE_ENV !== 'test') {
-                        window.location.href = options.mfaUrl;
+                    err_1 = _d.sent();
+                    // If popup is blocked
+                    if (err_1.errorCode === "popup_window_error" ||
+                        ((_a = err_1.message) === null || _a === void 0 ? void 0 : _a.includes("popup"))) {
+                        camsError_1 = new camsSdk.CAMSError(camsSdk.CAMSErrorType.POPUP_BLOCKED, "Both popup and redirect failed: " + err_1);
+                        setError(camsError_1);
+                        (_b = options.onAuthError) === null || _b === void 0 ? void 0 : _b.call(options, camsError_1);
+                        return [2 /*return*/];
                     }
-                    (_a = options.onAuthSuccess) === null || _a === void 0 ? void 0 : _a.call(options, tokenResponse.accessToken);
-                    return [3 /*break*/, 9];
-                case 4:
-                    err_1 = _e.sent();
-                    if (!(err_1.errorCode === "popup_window_error" ||
-                        ((_b = err_1.message) === null || _b === void 0 ? void 0 : _b.includes("popup")))) return [3 /*break*/, 8];
-                    _e.label = 5;
-                case 5:
-                    _e.trys.push([5, 7, , 8]);
-                    return [4 /*yield*/, instance.loginRedirect({
-                            scopes: scopes,
-                            prompt: options.prompt || "login",
-                        })];
-                case 6:
-                    _e.sent();
-                    return [2 /*return*/];
-                case 7:
-                    redirectErr_1 = _e.sent();
-                    camsError_1 = new camsSdk.CAMSError(camsSdk.CAMSErrorType.POPUP_BLOCKED, "Both popup and redirect failed: " + redirectErr_1);
-                    setError(camsError_1);
-                    (_c = options.onAuthError) === null || _c === void 0 ? void 0 : _c.call(options, camsError_1);
-                    return [2 /*return*/];
-                case 8:
                     camsError = new camsSdk.CAMSError(camsSdk.CAMSErrorType.API_VALIDATION_ERROR, "Login failed: " + err_1);
                     setError(camsError);
-                    (_d = options.onAuthError) === null || _d === void 0 ? void 0 : _d.call(options, camsError);
-                    return [3 /*break*/, 9];
-                case 9: return [2 /*return*/];
+                    (_c = options.onAuthError) === null || _c === void 0 ? void 0 : _c.call(options, camsError);
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     }); }, [instance, scopes, options]);
@@ -16791,7 +16846,12 @@ function useCAMSMSALAuth(options) {
                 case 1:
                     _a.sent();
                     setToken(null);
+                    setAccessToken(null);
+                    setIdToken(null);
                     setError(null);
+                    if (typeof window !== 'undefined') {
+                        localStorage.removeItem('cams-msal-auth');
+                    }
                     return [3 /*break*/, 3];
                 case 2:
                     err_2 = _a.sent();
@@ -17266,34 +17326,27 @@ function ProtectedRoute(_a) {
 }
 
 var CAMSMSALContext = React__default.createContext(null);
+var isTokenValid = function (token) {
+    try {
+        var payload = JSON.parse(atob(token.split('.')[1]));
+        return payload.exp * 1000 > Date.now();
+    }
+    catch (_a) {
+        return false;
+    }
+};
 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));
+        if (auth.accessToken && isTokenValid(auth.accessToken) && typeof window !== 'undefined') {
+            localStorage.setItem('cams-msal-auth', JSON.stringify({
+                accessToken: auth.accessToken,
+                idToken: auth.idToken
+            }));
         }
-    }, [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]);
+    }, [auth.accessToken, auth.idToken]);
+    var value = React__default.useMemo(function () { return auth; }, [auth]);
     return (jsxRuntimeExports.jsx(CAMSMSALContext.Provider, { value: value, children: children }));
 }
 function CAMSMSALProvider(props) {