Merge pull request #32 from DanielRivers/main

fix: don't store the decoded payload and decode when needed
kinde-oss · Nov 24, 2023 · 154084b · 154084b
2 parents 699fe0b + d7186bd
commit 154084b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/lib/__tests__/sdk/utilities/feature-flags.spec.ts b/lib/__tests__/sdk/utilities/feature-flags.spec.ts
@@ -12,10 +12,6 @@ describe('feature-flags', () => {
 
   beforeEach(async () => {
     mockAccessToken = mocks.getMockAccessToken();
-    await sessionManager.setSessionItem(
-      'access_token_payload',
-      mockAccessToken.payload
-    );
     await sessionManager.setSessionItem('access_token', mockAccessToken.token);
   });
 

diff --git a/lib/__tests__/sdk/utilities/token-claims.spec.ts b/lib/__tests__/sdk/utilities/token-claims.spec.ts
@@ -17,14 +17,6 @@ describe('token-claims', () => {
   beforeEach(async () => {
     mockAccessToken = mocks.getMockAccessToken();
     mockIdToken = mocks.getMockIdToken();
-    await sessionManager.setSessionItem(
-      'access_token_payload',
-      mockAccessToken.payload
-    );
-    await sessionManager.setSessionItem(
-      'id_token_payload',
-      mockIdToken.payload
-    );
     await sessionManager.setSessionItem('access_token', mockAccessToken.token);
     await sessionManager.setSessionItem('id_token', mockIdToken.token);
   });
@@ -38,7 +30,7 @@ describe('token-claims', () => {
       Object.keys(mockAccessToken.payload).forEach(async (name: string) => {
         const claimValue = await getClaimValue(sessionManager, name);
         const tokenPayload = mockAccessToken.payload as Record<string, unknown>;
-        expect(claimValue).toBe(tokenPayload[name]);
+        expect(claimValue).toStrictEqual(tokenPayload[name]);
       });
     });
 

diff --git a/lib/sdk/utilities/token-claims.ts b/lib/sdk/utilities/token-claims.ts
@@ -1,6 +1,7 @@
 import { type SessionManager } from '../session-managers/index.js';
 import { isTokenExpired } from './token-utils.js';
 import { type ClaimTokenType } from './types.js';
+import { jwtDecode } from 'jwt-decode';
 
 /**
  * Method extracts the provided claim from the provided token type in the
@@ -15,9 +16,10 @@ export const getClaimValue = async (
   claim: string,
   type: ClaimTokenType = 'access_token'
 ): Promise<unknown | null> => {
-  const tokenPayload = (await sessionManager.getSessionItem(
-    `${type}_payload`
-  )) as Record<string, unknown>;
+  const token = (await sessionManager.getSessionItem(
+    `${type}`
+  )) as string;
+  const tokenPayload: Record<string, unknown> = jwtDecode(token);
   return tokenPayload[claim] ?? null;
 };
 

diff --git a/lib/sdk/utilities/token-utils.ts b/lib/sdk/utilities/token-utils.ts
@@ -38,12 +38,7 @@ export const commitTokenToMemory = async (
   type: TokenType
 ): Promise<void> => {
   await sessionManager.setSessionItem(type, token);
-  if (type === 'access_token') {
-    const tokenPayload = jwtDecode(token);
-    await sessionManager.setSessionItem('access_token_payload', tokenPayload);
-  } else if (type === 'id_token') {
-    const tokenPayload = jwtDecode(token);
-    await sessionManager.setSessionItem('id_token_payload', tokenPayload);
+  if (type === 'id_token') {
     await commitUserToMemoryFromToken(sessionManager, token);
   }
 };