Merge branch 'release-2.0.2'

oat-sa · Jun 20, 2023 · e43c749 · e43c749
2 parents 2e346a3 + e0577fa
commit e43c749
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-sdk",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "displayName": "TAO Core SDK",
     "description": "Core libraries of TAO",
     "homepage": "https://github.com/oat-sa/tao-core-sdk-fe#readme",

diff --git a/src/core/jwt/jwtToken.js b/src/core/jwt/jwtToken.js
@@ -30,7 +30,11 @@
  */
 export function parseJwtPayload(token) {
     try {
-        return JSON.parse(atob(token.split('.')[1]));
+        let base64Payload = token.split('.')[1];
+        base64Payload = base64Payload.replace(/-/g, '+'); // replace - with +
+        base64Payload = base64Payload.replace(/_/g, '/'); // replace _ with /
+
+        return JSON.parse(atob(base64Payload));
     } catch (e) {
         return null;
     }

diff --git a/test/core/jwt/jwtToken/test.js b/test/core/jwt/jwtToken/test.js
@@ -48,6 +48,14 @@ define(['core/jwt/jwtToken'], jwtToken => {
         assert.equal(parseJwtPayload(), null, 'missing token returns null');
     });
 
+    QUnit.test('parses payload object from full token with unsupported characters', assert => {
+        assert.expect(2);
+        const token = 'eyJhbGciOiJIUzI1NiJ9.eyJmb28iOiI_In0.qXbg9lEnmvDekuDfNqiAdqYb3Yx1iTLw7RyUGoz5I9w';
+        const result = parseJwtPayload(token);
+        assert.ok(typeof result === 'object', 'parsed payload is an object');
+        assert.equal(result.foo, '?');
+    });
+
     QUnit.module('getJwtTTL');
 
     const time1 = 1620651921250;