@nibssplc/cams-sdk-react 0.0.1-beta.34 → 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,6 +16721,34 @@ 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 {
@@ -16770,6 +16798,10 @@ function useCAMSMSALAuth(options) {
                         })
                             .then(function (response) {
                             var _a;
+                            camsSdk.Logger.debug("Login Token response:", {
+                                accessToken: accessToken,
+                                idToken: idToken
+                            });
                             setToken(response.accessToken);
                             setAccessToken(response.accessToken);
                             setIdToken(response.idToken);
@@ -16814,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();
@@ -17289,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) {