Merge pull request #29 from Orfium/fix/diff-organization-refetch

Orfium · Oct 10, 2022 · ac59a91 · ac59a91
2 parents 4f5196a + 8306d1b
commit ac59a91
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/authentication/context.test.tsx b/src/authentication/context.test.tsx
@@ -108,7 +108,21 @@ describe('Context', () => {
     test('with cached results', async () => {
       const NEW_FAKE_EXPIRED_TOKEN = getNewFakeToken();
       const setToken = useRequestToken.getState().setToken;
+      const setSelectedOrganization = useOrganization.getState().setSelectedOrganization;
       setToken(NEW_FAKE_EXPIRED_TOKEN);
+      setSelectedOrganization({
+        org_id: 'org_WYZLEMyTm2xEbnbn',
+        display_name: 'test',
+        name: 'test',
+        can_administrate: true,
+        metadata: {
+          type: 'test',
+          product_codes: 'test',
+        },
+        branding: {
+          logo_url: 'test',
+        },
+      });
 
       const { token, decodedToken } = await getTokenSilently();
 

diff --git a/src/authentication/context.tsx b/src/authentication/context.tsx
@@ -95,7 +95,7 @@ export const getTokenSilently = async (
       ? new Date(decodedToken?.exp * 1000).getTime() < new Date().getTime()
       : true; // has expired
 
-  if (!isExpired && decodedToken.org_id) {
+  if (!isExpired && decodedToken.org_id && decodedToken.org_id === selectedOrganization?.org_id) {
     return { token: stateToken, decodedToken };
   }