use storageManager configuration if tokenManager.storage is not set

okta · Apr 21, 2021 · e0ae3fa · e0ae3fa
1 parent 105ffe6
commit e0ae3fa
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -433,7 +433,7 @@ const storageProvider = {
 }
 
 var config = {
-  storage: {
+  storageManager: {
     token: {
       storageProvider: storageProvider
     }

diff --git a/lib/TokenManager.ts b/lib/TokenManager.ts
@@ -442,7 +442,9 @@ export class TokenManager {
   _emitEventsForCrossTabsStorageUpdate: (newValue: string, oldValue: string) => void;
 
   constructor(sdk: OktaAuth, options: TokenManagerOptions) {
-    options = Object.assign({}, DEFAULT_OPTIONS, removeNils(options));
+    const { storageType, storageTypes } = sdk.storageManager.getOptionsForSection('token');
+    const storageManagerStorage = storageType || storageTypes && storageTypes[0];
+    options = Object.assign({}, DEFAULT_OPTIONS, removeNils({storage: storageManagerStorage}), removeNils(options));
 
     const emitter = (sdk as any).emitter;
     if (!emitter) {

diff --git a/lib/browser/browser.ts b/lib/browser/browser.ts
@@ -130,6 +130,8 @@ class OktaAuthBrowser extends OktaAuthBase implements OktaAuth, SignoutAPI {
       httpRequestClient: fetchRequest,
       storageUtil: args.storageUtil || browserStorage,
       cookies: getCookieSettings(args, OktaAuthBrowser.features.isHTTPS()),
+    }, {
+      ...args,
       storageManager: Object.assign({
         token: {
           storageTypes: [
@@ -154,7 +156,7 @@ class OktaAuthBrowser extends OktaAuthBase implements OktaAuth, SignoutAPI {
           ]
         }
       }, args.storageManager)
-    }, args));
+    }));
 
     // Add shims for compatibility, these will be removed in next major version. OKTA-362589
     Object.assign(this.options.storageUtil, {

diff --git a/test/spec/tokenManager.js b/test/spec/tokenManager.js
@@ -20,15 +20,18 @@ var secureCookieSettings = {
 };
 
 function createAuth(options) {
-  options = options || {};
-  options.tokenManager = options.tokenManager || {};
+  options = Object.assign({}, options);
+  options.tokenManager = Object.assign({}, options.tokenManager);
+  options.cookies = Object.assign({}, options.cookies);
+  options.storageManager = Object.assign({}, options.storageManager);
   jest.spyOn(SdkClock, 'create').mockReturnValue(new SdkClock(options.localClockOffset));
   return new OktaAuth({
-    cookies: options.cookies || {},
+    cookies: options.cookies,
     pkce: false,
     issuer: 'https://auth-js-test.okta.com',
     clientId: 'NPSfOkH5eZrTy8PMDlvx',
     redirectUri: 'https://example.com/redirect',
+    storageManager: options.storageManager,
     tokenManager: {
       expireEarlySeconds: options.tokenManager.expireEarlySeconds || 0,
       storage: options.tokenManager.storage,
@@ -140,7 +143,6 @@ describe('TokenManager', function() {
         },
         tokenManager: {
           storage: 'cookie',
-          sessionCookie: true
         }
       });
       var setCookieMock = util.mockSetCookie();
@@ -229,6 +231,40 @@ describe('TokenManager', function() {
         'test-idToken': tokens.standardIdTokenParsed
       });
     });
+    it('honors StorageManager configuration', function () {
+      setupSync({
+        storageManager: {
+          token: {
+            storageTypes: ['cookie'],
+            useMultipleCookies: true,
+          }
+        }
+      });
+      var setCookieMock = util.mockSetCookie();
+      client.tokenManager.add('test-idToken', tokens.standardIdTokenParsed);
+      expect(setCookieMock).toHaveBeenCalledWith(
+        'okta-token-storage_test-idToken',
+        JSON.stringify(tokens.standardIdTokenParsed),
+        '2200-01-01T00:00:00.000Z',
+        secureCookieSettings
+      );
+    });
+    it('favors token.storage configuration over storageManager.token', function () {
+      setupSync({
+        storageManager: {
+          token: {
+            storageTypes: ['cookie'],
+          }
+        },
+        tokenManager: {
+          storage: 'sessionStorage',
+        }
+      });
+      client.tokenManager.add('test-idToken', tokens.standardIdTokenParsed);
+      oauthUtil.expectTokenStorageToEqual(sessionStorage, {
+        'test-idToken': tokens.standardIdTokenParsed
+      });
+    });
     it('defaults to sessionStorage if localStorage isn\'t available', function() {
       jest.spyOn(window.console, 'warn');
       oauthUtil.mockLocalStorageError();
@@ -1665,7 +1701,8 @@ describe('TokenManager', function() {
       sdkMock = {
         options: {},
         storageManager: {
-          getTokenStorage: jest.fn()
+          getTokenStorage: jest.fn(),
+          getOptionsForSection: jest.fn().mockReturnValue({}),
         },
         emitter
       };