@schibsted/account-sdk-browser 4.8.7-beta.8 → 5.0.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schibsted/account-sdk-browser",
-  "version": "4.8.7-beta.8",
+  "version": "5.0.0-beta.1",
   "description": "Schibsted account SDK for browsers",
   "main": "index.js",
   "type": "module",

package/src/identity.js

@@ -148,6 +148,10 @@ const HAS_SESSION_CACHE_KEY = 'hasSession-cache';
 const SESSION_CALL_BLOCKED_CACHE_KEY = 'sessionCallBlocked-cache';
 const SESSION_CALL_BLOCKED_TTL = 1000 * 60 * 5;
 
+const TAB_ID_KEY = 'tab-id-cache';
+const TAB_ID = Math.floor(Math.random() * 100000)
+const TAB_ID_TTL = 1000 * 60 * 60 * 24 * 30;
+
 const globalWindow = () => window;
 
 /**
@@ -185,7 +189,8 @@ export class Identity extends EventEmitter {
         this._sessionInitiatedSent = false;
         this.window = window;
         this.clientId = clientId;
-        this.cache = new Cache(() => this.window && this.window.sessionStorage);
+        this.sessionStorageCache = new Cache(() => this.window && this.window.sessionStorage);
+        this.localStorageCache = new Cache(() => this.window && this.window.localStorage);
         this.redirectUri = redirectUri;
         this.env = env;
         this.log = log;
@@ -207,6 +212,23 @@ export class Identity extends EventEmitter {
         this._unblockSessionCall();
     }
 
+    /**
+     * Read tabId from session storage
+     * @returns {number}
+     * @private
+     */
+    _getTabId() {
+        if (this._enableSessionCaching) {
+            const tabId = this.cache.get(TAB_ID_KEY);
+            if (!tabId) {
+                this.cache.set(TAB_ID_KEY, TAB_ID, TAB_ID_TTL);
+                return TAB_ID;
+            }
+
+            return tabId;
+        }
+    }
+
     /**
      * Checks if getting session is blocked
      * @private
@@ -214,9 +236,7 @@ export class Identity extends EventEmitter {
      * @returns {boolean|void}
      */
     _isSessionCallBlocked(){
-        if (this._enableSessionCaching) {
-            return this.cache.get(SESSION_CALL_BLOCKED_CACHE_KEY);
-        }
+        return this.localStorageCache.get(SESSION_CALL_BLOCKED_CACHE_KEY);
     }
 
     /**
@@ -226,15 +246,13 @@ export class Identity extends EventEmitter {
      * @returns {void}
      */
     _blockSessionCall(){
-        if (this._enableSessionCaching) {
-            const SESSION_CALL_BLOCKED = true;
+        const SESSION_CALL_BLOCKED = true;
 
-            this.cache.set(
-                SESSION_CALL_BLOCKED_CACHE_KEY,
-                SESSION_CALL_BLOCKED,
-                SESSION_CALL_BLOCKED_TTL
-            );
-        }
+        this.localStorageCache.set(
+            SESSION_CALL_BLOCKED_CACHE_KEY,
+            SESSION_CALL_BLOCKED,
+            SESSION_CALL_BLOCKED_TTL
+        );
     }
 
     /**
@@ -244,9 +262,7 @@ export class Identity extends EventEmitter {
      * @returns {void}
      */
     _unblockSessionCall(){
-        if (this._enableSessionCaching) {
-            this.cache.delete(SESSION_CALL_BLOCKED_CACHE_KEY);
-        }
+        this.localStorageCache.delete(SESSION_CALL_BLOCKED_CACHE_KEY);
     }
 
     /**
@@ -566,7 +582,7 @@ export class Identity extends EventEmitter {
         const _getSession = async () => {
             if (this._enableSessionCaching) {
                 // Try to resolve from cache (it has a TTL)
-                let cachedSession = this.cache.get(HAS_SESSION_CACHE_KEY);
+                let cachedSession = this.sessionStorageCache.get(HAS_SESSION_CACHE_KEY);
                 if (cachedSession) {
                     return _postProcess(cachedSession);
                 }
@@ -577,7 +593,7 @@ export class Identity extends EventEmitter {
             } catch (err) {
                 if (err && err.code === 400 && this._enableSessionCaching) {
                     const expiresIn = 1000 * (err.expiresIn || 300);
-                    this.cache.set(HAS_SESSION_CACHE_KEY, { error: err }, expiresIn);
+                    this.sessionStorageCache.set(HAS_SESSION_CACHE_KEY, { error: err }, expiresIn);
                 }
                 throw err;
             }
@@ -589,12 +605,12 @@ export class Identity extends EventEmitter {
 
                     await this.callbackBeforeRedirect();
 
-                    return this._sessionService.makeUrl(sessionData.redirectURL);
+                    return this._sessionService.makeUrl(sessionData.redirectURL, {tabId: this._getTabId()});
                 }
 
                 if (this._enableSessionCaching) {
                     const expiresIn = 1000 * (sessionData.expiresIn || 300);
-                    this.cache.set(HAS_SESSION_CACHE_KEY, sessionData, expiresIn);
+                    this.sessionStorageCache.set(HAS_SESSION_CACHE_KEY, sessionData, expiresIn);
                 }
             }
 
@@ -642,7 +658,7 @@ export class Identity extends EventEmitter {
      * @returns {void}
      */
     clearCachedUserSession() {
-        this.cache.delete(HAS_SESSION_CACHE_KEY);
+        this.sessionStorageCache.delete(HAS_SESSION_CACHE_KEY);
     }
 
     /**
@@ -853,7 +869,7 @@ export class Identity extends EventEmitter {
         prompt = 'select_account'
     }) {
         this._closePopup();
-        this.cache.delete(HAS_SESSION_CACHE_KEY);
+        this.sessionStorageCache.delete(HAS_SESSION_CACHE_KEY);
         const url = this.loginUrl({
             state,
             acrValues,
@@ -902,7 +918,7 @@ export class Identity extends EventEmitter {
      * @return {void}
      */
     logout(redirectUri = this.redirectUri) {
-        this.cache.delete(HAS_SESSION_CACHE_KEY);
+        this.sessionStorageCache.delete(HAS_SESSION_CACHE_KEY);
         this._maybeClearVarnishCookie();
         this.emit('logout');
         this.window.location.href = this.logoutUrl(redirectUri);

package/src/version.js

@@ -1,5 +1,5 @@
 // Automatically generated in 'npm version' by scripts/genversion.js
 
 'use strict'
-const version = '4.8.7-beta.8';
+const version = '5.0.0-beta.1';
 export default version;