fix deprecated contextHolder functions

frontegg · Oct 21, 2024 · c3ff248 · c3ff248
1 parent 88e69d9
commit c3ff248
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/packages/nextjs/src/common/FronteggBaseProvider.tsx b/packages/nextjs/src/common/FronteggBaseProvider.tsx
@@ -2,7 +2,7 @@
 
 import React, { FC, useMemo, useRef } from 'react';
 import { FronteggStoreProvider, CustomComponentRegister } from '@frontegg/react-hooks';
-import { ContextHolder } from '@frontegg/rest-api';
+import { ContextHolder, IUserProfile } from '@frontegg/rest-api';
 import type { FronteggProviderProps } from '../types';
 import AppContext from './AppContext';
 import initializeFronteggApp from '../utils/initializeFronteggApp';
@@ -28,8 +28,10 @@ const Connector: FC<FronteggProviderProps> = ({ router, appName = 'default', ...
       }),
     [props]
   );
-  ContextHolder.setOnRedirectTo(onRedirectTo);
+  ContextHolder.for(appName).setOnRedirectTo(onRedirectTo);
 
+  ContextHolder.for(appName).setAccessToken(session?.accessToken ?? null);
+  ContextHolder.for(appName).setUser(session?.['user'] as any);
   useRequestAuthorizeSSR({ app, user, tenants, activeTenant, session });
   return (
     <AppContext.Provider value={app}>

diff --git a/packages/nextjs/src/common/hooks.ts b/packages/nextjs/src/common/hooks.ts
@@ -1,4 +1,4 @@
-import { useLoginActions } from '@frontegg/react-hooks';
+import { useLoginActions, useRootState } from '@frontegg/react-hooks';
 import { ContextHolder } from '@frontegg/rest-api';
 import { buildLogoutRoute } from '../api/urls';
 
@@ -10,10 +10,11 @@ import { buildLogoutRoute } from '../api/urls';
  */
 
 export const useLogoutHostedLogin = () => {
+  const { appName } = useRootState();
   const { logout } = useLoginActions();
 
   return (redirectUrl?: string) => {
-    const contextBaseUrl = ContextHolder.getContext()?.baseUrl;
+    const contextBaseUrl = ContextHolder.for(appName).getContext()?.baseUrl;
     const baseUrl = typeof contextBaseUrl === 'function' ? contextBaseUrl('') : contextBaseUrl;
     const finalRedirectUrl = redirectUrl ?? window.location.href;
     const logoutRoute = buildLogoutRoute(finalRedirectUrl, baseUrl).asPath;

diff --git a/packages/nextjs/src/no-ssr/FronteggProviderNoSSR.tsx b/packages/nextjs/src/no-ssr/FronteggProviderNoSSR.tsx
@@ -48,7 +48,7 @@ const Connector: FC<ConnectorProps> = (_props) => {
     }
     return createdApp;
   }, [appName, props, hostedLoginBox, baseName, onRedirectTo]);
-  ContextHolder.setOnRedirectTo(onRedirectTo);
+  ContextHolder.for(appName ?? 'default').setOnRedirectTo(onRedirectTo);
 
   useEffect(() => {
     app.store.dispatch({ type: 'auth/requestAuthorize', payload: true });