fix: remove left over jwt-decode

kinde-oss · Oct 18, 2024 · 7edd1d2 · 7edd1d2
1 parent c3e89c6
commit 7edd1d2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 14 deletions.
diff --git a/src/session/getAccessToken.js b/src/session/getAccessToken.js
@@ -1,6 +1,6 @@
-import jwtDecode from 'jwt-decode';
 import {sessionManager} from './sessionManager';
 import {config} from '../config/index';
+import {jwtDecoder} from '@kinde/jwt-decoder';
 
 /**
  * @callback getAccessToken
@@ -17,7 +17,7 @@ import {config} from '../config/index';
 // @ts-ignore
 export const getAccessTokenFactory = (req, res) => async () => {
   try {
-    return jwtDecode(
+    return jwtDecoder(
       await sessionManager(req, res).getSessionItem('access_token')
     );
   } catch (err) {

diff --git a/src/session/getIdToken.js b/src/session/getIdToken.js
@@ -1,6 +1,6 @@
-import jwtDecode from 'jwt-decode';
 import {sessionManager} from './sessionManager';
 import {config} from '../config/index';
+import {jwtDecoder} from '@kinde/jwt-decoder';
 
 /**
  * @callback getIdToken
@@ -17,7 +17,9 @@ import {config} from '../config/index';
 // @ts-ignore
 export const getIdTokenFactory = (req, res) => async () => {
   try {
-    return jwtDecode(await sessionManager(req, res).getSessionItem('id_token'));
+    return jwtDecoder(
+      await sessionManager(req, res).getSessionItem('id_token')
+    );
   } catch (err) {
     if (config.isDebugMode) {
       console.error(err);

diff --git a/src/session/getUserOrganizations.ts b/src/session/getUserOrganizations.ts
@@ -16,17 +16,19 @@ export const getUserOrganizationsFactory =
         'id_token'
       )) as {id: string; name: string}[];
 
-      const hasuraOrgCodes = (await kindeClient.getClaimValue(
-        session,
-        'x-hasura-org-codes',
-        'id_token'
-      )) as string[] ?? [];
+      const hasuraOrgCodes =
+        ((await kindeClient.getClaimValue(
+          session,
+          'x-hasura-org-codes',
+          'id_token'
+        )) as string[]) ?? [];
 
-      const hasuraOrganizations = (await kindeClient.getClaimValue(
-        session,
-        'x-hasura-organizations',
-        'id_token'
-      )) as {id: string; name: string}[] ?? [];
+      const hasuraOrganizations =
+        ((await kindeClient.getClaimValue(
+          session,
+          'x-hasura-organizations',
+          'id_token'
+        )) as {id: string; name: string}[]) ?? [];
 
       return {
         orgCodes: [...userOrgs.orgCodes, ...hasuraOrgCodes],