@evoke-platform/context 1.3.1 → 1.3.2-testing.0

package/dist/authentication/AuthenticationContextProvider.d.ts

@@ -1,6 +1,7 @@
 import { RedirectRequest } from '@azure/msal-browser';
 import { IMsalContext } from '@azure/msal-react';
 import { ReactNode } from 'react';
+import { AuthContextProps } from 'react-oidc-context';
 export type AuthenticationContext = {
     account: UserAccount;
     logout: VoidFunction;
@@ -15,6 +16,7 @@ export type UserAccount = {
 };
 export type AuthenticationContextProviderProps = {
     msal?: IMsalContext;
+    oidcInstance?: AuthContextProps;
     authRequest: AuthenticationRequest;
     children?: ReactNode;
 };

package/dist/authentication/AuthenticationContextProvider.js

@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useCallback, useContext, useMemo } from 'react';
-import { useAuth } from 'react-oidc-context';
 const Context = createContext(undefined);
 Context.displayName = 'AuthenticationContext';
 function AuthenticationContextProvider(props) {
@@ -19,8 +18,8 @@ function AuthenticationContextProvider(props) {
         return (_jsx(MsalProvider, { msal: msal, authRequest: authRequest, children: children }));
     }
     else {
-        const { authRequest, children } = props;
-        return _jsx(OidcProvider, { authRequest: authRequest, children: children });
+        const { oidcInstance, authRequest, children } = props;
+        return (_jsx(OidcProvider, { oidcInstance: oidcInstance, authRequest: authRequest, children: children }));
     }
 }
 function MsalProvider({ msal, authRequest, children }) {
@@ -64,15 +63,17 @@ function MsalProvider({ msal, authRequest, children }) {
     }, [account, msal, getAccessToken, authRequest]);
     return _jsx(Context.Provider, { value: context, children: children });
 }
-function OidcProvider({ authRequest, children }) {
+function OidcProvider({ oidcInstance, authRequest, children }) {
     var _a, _b;
+    if (!oidcInstance) {
+        throw new Error('OIDC instance is required for OidcProvider');
+    }
     // The authRequest for react-oidc is formatted slightly differently than msal.
     const oidcAuthRequest = {
         scope: (_b = (_a = authRequest.scopes) === null || _a === void 0 ? void 0 : _a.join(' ')) !== null && _b !== void 0 ? _b : 'openid profile email',
         extraQueryParams: authRequest.extraQueryParameters,
         state: authRequest.state,
     };
-    const auth = useAuth();
     const getAccessToken = useCallback(function () {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
@@ -80,49 +81,49 @@ function OidcProvider({ authRequest, children }) {
                 // With automaticSilentRenew: true, oidc-client-ts will attempt to renew the token in the background before it expires.
                 // However, this is not guaranteed to be perfectly in sync with your API calls. Always check for expiration here and call signinSilent if needed
                 // to ensure you get a valid token on demand.
-                if (((_a = auth.user) === null || _a === void 0 ? void 0 : _a.access_token) && !auth.user.expired) {
-                    return auth.user.access_token;
+                if (((_a = oidcInstance.user) === null || _a === void 0 ? void 0 : _a.access_token) && !oidcInstance.user.expired) {
+                    return oidcInstance.user.access_token;
                 }
                 // Token is either missing or expired - attempt silent refresh.
-                const user = yield auth.signinSilent(oidcAuthRequest);
+                const user = yield oidcInstance.signinSilent(oidcAuthRequest);
                 // If signinSilent returns null, it means silent login failed
                 if (!user) {
                     console.log('Silent login failed, redirecting to login');
-                    auth.signinRedirect(oidcAuthRequest);
+                    oidcInstance.signinRedirect(oidcAuthRequest);
                     return '';
                 }
-                return ((_b = auth.user) === null || _b === void 0 ? void 0 : _b.access_token) || '';
+                return ((_b = oidcInstance.user) === null || _b === void 0 ? void 0 : _b.access_token) || '';
             }
             catch (error) {
                 console.error('Failed to get access token:', error);
                 // If silent refresh throws an error (e.g., network failure, missing silent_redirect_uri,
                 // invalid session, refresh token expired, or provider returned an error), redirect to login
-                auth.signinRedirect(oidcAuthRequest);
+                oidcInstance.signinRedirect(oidcAuthRequest);
                 return '';
             }
         });
-    }, [auth, authRequest]);
+    }, [oidcInstance, authRequest]);
     const context = useMemo(() => {
         var _a, _b, _c, _d;
-        return auth.isAuthenticated && auth.user
+        return oidcInstance.isAuthenticated && oidcInstance.user
             ? {
                 account: {
-                    id: auth.user.profile.sub,
-                    name: (_a = auth.user.profile.name) !== null && _a !== void 0 ? _a : (`${(_b = auth.user.profile.given_name) !== null && _b !== void 0 ? _b : ''} ${(_c = auth.user.profile.family_name) !== null && _c !== void 0 ? _c : ''}` ||
+                    id: oidcInstance.user.profile.sub,
+                    name: (_a = oidcInstance.user.profile.name) !== null && _a !== void 0 ? _a : (`${(_b = oidcInstance.user.profile.given_name) !== null && _b !== void 0 ? _b : ''} ${(_c = oidcInstance.user.profile.family_name) !== null && _c !== void 0 ? _c : ''}` ||
                         undefined),
-                    username: (_d = auth.user.profile.preferred_username) !== null && _d !== void 0 ? _d : auth.user.profile.email,
-                    lastLoginTime: auth.user.profile.lastLoginTime,
+                    username: (_d = oidcInstance.user.profile.preferred_username) !== null && _d !== void 0 ? _d : oidcInstance.user.profile.email,
+                    lastLoginTime: oidcInstance.user.profile.lastLoginTime,
                 },
                 logout: () => {
-                    auth.signoutRedirect({
-                        // Fusion auth requires an absolute url.
+                    oidcInstance.signoutRedirect({
+                        // Fusion oidcInstance requires an absolute url.
                         post_logout_redirect_uri: `${window.location.origin}/logout?p=${encodeURIComponent(window.location.pathname + window.location.search)}`,
                     });
                 },
                 getAccessToken,
             }
             : undefined;
-    }, [auth, getAccessToken]);
+    }, [oidcInstance, getAccessToken]);
     return _jsx(Context.Provider, { value: context, children: children });
 }
 export function useAuthenticationContext() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evoke-platform/context",
-    "version": "1.3.1",
+    "version": "1.3.2-testing.0",
     "description": "Utilities that provide context to Evoke platform widgets",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",