Skip to content

Commit fee6cde

Browse files
committed
ATL-589 Update the getJwtClaims method
1 parent a88a2b5 commit fee6cde

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/helpers.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { HttpsProxyAgent } from 'https-proxy-agent'
2-
import jwtDecode from 'jwt-decode'
2+
import { InvalidTokenError, jwtDecode } from 'jwt-decode'
33
import z, { ZodError } from 'zod'
44

55
export const jwtClaimsPrincipalSchema = z.object({
@@ -34,19 +34,16 @@ export const getJwtClaims = (bearerToken: string): TJwtClaims => {
3434
let claimsUnchecked: unknown
3535
try {
3636
claimsUnchecked = jwtDecode(bearerToken)
37-
}
38-
catch (err) {
39-
console.error('could not decode jwt token', err)
40-
throw err
41-
}
42-
try {
4337
claims = jwtClaimsSchema.parse(claimsUnchecked)
4438
}
4539
catch (err) {
40+
if (err instanceof InvalidTokenError) {
41+
console.error('could not decode jwt token', err)
42+
}
4643
if (err instanceof ZodError) {
4744
console.error('unexpected jwt claims schema', err.message)
48-
throw err
4945
}
46+
throw err
5047
}
5148
return claims
5249
}

0 commit comments

Comments
 (0)