Merge upstream changes

yalla-coop · Feb 22, 2024 · e7e1815 · e7e1815
1 parent e92007f
commit e7e1815
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/.changeset/poor-panthers-shout.md b/.changeset/poor-panthers-shout.md
@@ -0,0 +1,5 @@
+---
+'@nhost/hasura-auth-js': patch
+---
+
+fix(hasura-auth-js): replace `jwt-decode` with `jose` for decoding access tokens that works on both the browser and Node.js
diff --git a/packages/hasura-auth-js/package.json b/packages/hasura-auth-js/package.json
@@ -66,8 +66,8 @@
   "dependencies": {
     "@simplewebauthn/browser": "^6.2.2",
     "fetch-ponyfill": "^7.1.0",
+    "jose": "^5.2.2",
     "js-cookie": "^3.0.5",
-    "jwt-decode": "^3.1.2",
     "xstate": "^4.38.3"
   },
   "devDependencies": {

diff --git a/packages/hasura-auth-js/src/hasura-auth-client.ts b/packages/hasura-auth-js/src/hasura-auth-client.ts
@@ -1,4 +1,4 @@
-import jwt_decode from 'jwt-decode'
+import * as jose from 'jose'
 import { interpret } from 'xstate'
 import {
   EMAIL_NEEDS_VERIFICATION,
@@ -625,7 +625,7 @@ export class HasuraAuthClient {
   public getDecodedAccessToken(): JWTClaims | null {
     const jwt = this.getAccessToken()
     if (!jwt) return null
-    return jwt_decode<JWTClaims>(jwt)
+    return jose.decodeJwt<JWTClaims>(jwt)
   }
 
   /**

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml