handle cookie storage

okta · Jan 14, 2022 · 286371a · 286371a
1 parent cd70997
commit 286371a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/lib/browser/browserStorage.ts b/lib/browser/browserStorage.ts
@@ -140,14 +140,15 @@ var storageUtil: BrowserStorageUtil = {
     const storage: CookieStorage = {
       getItem: function(key) {
         const value = storageUtil.storage.get(key);
-        try {
-          // return object
-          return JSON.parse(value);
-        } catch (e) {
-          // ignore parse error
-          // return string value
-          return value;
+        // returns object that contains all cookies when no key is provided
+        if (!key) {
+          try {
+            return JSON.parse(value);
+          } catch (e) {
+            // do nothing
+          }
         }
+        return value;
       },
       setItem: function(key, value, expiresAt = '2200-01-01T00:00:00.000Z') {
         // By defauilt, cookie shouldn't expire
@@ -256,8 +257,7 @@ var storageUtil: BrowserStorageUtil = {
     get: function(name: string): string {
       // get all cookies
       if (typeof name === 'undefined') {
-        // js-cookie returns object when no argument is provided
-        const value = Cookies.get();
+        const value = Cookies.get(); // no arguments returns all cookies in object
         return JSON.stringify(value);
       }
       // get cookie by name

diff --git a/test/spec/TokenManager/browser.ts b/test/spec/TokenManager/browser.ts
@@ -778,7 +778,7 @@ describe('TokenManager (browser)', function() {
         return client.tokenManager.get('test-idToken')
         .then(function(token) {
           expect(token).toEqual(tokens.standardIdTokenParsed);
-          expect(getCookieMock).toHaveBeenCalledWith();
+          expect(getCookieMock).toHaveBeenCalledWith(undefined);
           expect(setCookieMock).not.toHaveBeenCalled();
         });
       });