Merge 011f5aa into ed0d23c

lifeomic · Jan 30, 2024 · 1a98e3d · 1a98e3d
2 parents ed0d23c + 011f5aa
commit 1a98e3d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/hooks/useOAuthFlow.test.tsx b/src/hooks/useOAuthFlow.test.tsx
@@ -116,7 +116,7 @@ test('allows for providing auth config as a function', () => {
   });
 
   expect(authConfigFn).toHaveBeenCalledTimes(1);
-  expect(authConfigFn).toHaveBeenCalledWith(authResult);
+  expect(authConfigFn).toHaveBeenCalledWith(authResult.accessToken);
   expect(result.current.authConfig).toEqual({
     ...authConfig,
     additionalParameters,

diff --git a/src/hooks/useOAuthFlow.tsx b/src/hooks/useOAuthFlow.tsx
@@ -38,11 +38,11 @@ export interface LogoutParams {
  * OAuth flows.
  *
  * While typically not needed, this function is invoked with the current
- * auth result to be able to provide a dynamic auth configuration.
+ * access token to be able to provide a dynamic auth configuration.
  *
  * @example
  * <RootProviders
- *   authConfig={(currentAuthResult) => {
+ *   authConfig={(currentAccessToken) => {
  *     if (...) {
  *       return {
  *         ...config,
@@ -53,9 +53,7 @@ export interface LogoutParams {
  *   }}
  * />
  */
-export type AuthConfigGetter = (
-  currentAuthResult?: AuthResult,
-) => AuthConfiguration;
+export type AuthConfigGetter = (accessToken?: string) => AuthConfiguration;
 
 const OAuthContext = createContext<OAuthConfig>({
   login: (_) => Promise.reject(),
@@ -82,9 +80,9 @@ export const OAuthContextProvider = ({
   const authConfig = useMemo(
     () =>
       typeof authConfigOrGetter === 'function'
-        ? authConfigOrGetter(authResult)
+        ? authConfigOrGetter(authResult?.accessToken)
         : authConfigOrGetter,
-    [authConfigOrGetter, authResult],
+    [authConfigOrGetter, authResult?.accessToken],
   );
 
   // PKCE is required
@@ -143,7 +141,13 @@ export const OAuthContextProvider = ({
         onFail?.(error);
       }
     },
-    [queryClient, isLoggedIn, authResult, clearAuthResult, authConfig],
+    [
+      queryClient,
+      isLoggedIn,
+      authResult?.refreshToken,
+      clearAuthResult,
+      authConfig,
+    ],
   );
 
   const login = useCallback(