fix: reloads on organization switch

Orfium · Aug 31, 2023 · dff5a2d · dff5a2d
1 parent f85dca8
commit dff5a2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/authentication/Authentication.tsx b/src/authentication/Authentication.tsx
@@ -91,7 +91,9 @@ const AuthenticationWrapper: React.FunctionComponent = ({ children }) => {
         }
       })();
     }
-  }, [getAccessTokenSilently, selectedOrganization?.org_id]);
+    // @NOTE selectedOrganization?.org_id, isLoading, systemLoading
+    // are missing on purpose from the deps as these are being updated from places where the organization id is being handled with refresh from auth0
+  }, [getAccessTokenSilently, loginWithRedirect, setOrganizations, setSelectedOrganization]);
 
   // when loading is true before navigation this is not showing anymore
   if (systemLoading === undefined || systemLoading || isLoading || !isAuthenticated) {

diff --git a/src/authentication/components/TopBar/TopBar.tsx b/src/authentication/components/TopBar/TopBar.tsx
@@ -53,6 +53,7 @@ export const TopBar: React.FC<TopBarProps> = memo(
                 const foundOrg = organizations.find((org) => org.display_name === option);
                 if (foundOrg) {
                   const client = await getAuth0Client();
+                  await client.logout({ openUrl: false });
                   await client.loginWithRedirect({
                     authorizationParams: {
                       organization: foundOrg.org_id,

diff --git a/src/authentication/context.tsx b/src/authentication/context.tsx
@@ -32,6 +32,7 @@ export const providerConfig: Auth0ClientOptions = {
   },
   useRefreshTokens: true,
   cacheLocation: 'localstorage',
+  useRefreshTokensFallback: true, // fix issue with logout https://community.auth0.com/t/auth0-spa-2-x-returning-missing-refresh-token/98999/18
 };
 
 export const defaultContextValues: AuthenticationContextProps = {