@schibsted/account-sdk-browser 5.0.1-beta.3 → 5.0.1-beta.4

package/es5/identity.js

@@ -1200,14 +1200,15 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
     }
 
     /**
-     * Checks if calling GET session is blocked
+     * Checks if calling GET session is blocked by a cache storage
      * @private
-     * @returns {number|null}
+     * @param {Cache} cache - cache to check
+     * @returns {string|null}
      */
   }, {
     key: "_isSessionCallBlocked",
-    value: function _isSessionCallBlocked() {
-      return this.localStorageCache.get(SESSION_CALL_BLOCKED_CACHE_KEY);
+    value: function _isSessionCallBlocked(cache) {
+      return cache.get(SESSION_CALL_BLOCKED_CACHE_KEY);
     }
 
     /**
@@ -1218,6 +1219,10 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "_blockSessionCall",
     value: function _blockSessionCall() {
+      // session storage block protects against single tab, multiple identity instance concurrency
+      this.sessionStorageCache.set(SESSION_CALL_BLOCKED_CACHE_KEY, this._tabId, SESSION_CALL_BLOCKED_TTL);
+
+      // local storage block protects against cross-tab concurrency
       this.localStorageCache.set(SESSION_CALL_BLOCKED_CACHE_KEY, this._tabId, SESSION_CALL_BLOCKED_TTL);
     }
 
@@ -1229,9 +1234,10 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
   }, {
     key: "_unblockSessionCallByTab",
     value: function _unblockSessionCallByTab() {
-      if (this._isSessionCallBlocked() === this._tabId) {
+      if (this._isSessionCallBlocked(this.localStorageCache) === this._tabId) {
         this.localStorageCache.delete(SESSION_CALL_BLOCKED_CACHE_KEY);
       }
+      this.sessionStorageCache.delete(SESSION_CALL_BLOCKED_CACHE_KEY);
     }
 
     /**
@@ -1573,8 +1579,8 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
                       while (1) switch (_context.prev = _context.next) {
                         case 0:
                           _context.prev = 0;
-                          // Blocking future calls to session-service. This lock is removed after the response is processed
-                          // to account for redirection that can happen towards session-service too
+                          /* Blocking future calls to session-service. This lock is removed after the response is processed
+                           to account for redirection that can happen towards session-service too */
                           _this2._blockSessionCall();
                           _context.next = 4;
                           return _this2._sessionService.get('/v2/session', {
@@ -1656,7 +1662,7 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
                           }
                           return _context3.abrupt("return", _postProcess(cachedSession));
                         case 4:
-                          if (!_this2._isSessionCallBlocked()) {
+                          if (!(_this2._isSessionCallBlocked(_this2.sessionStorageCache) || _this2._isSessionCallBlocked(_this2.localStorageCache))) {
                             _context3.next = 13;
                             break;
                           }
@@ -1713,9 +1719,7 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
                                 randomWaitTime = MIN_SESSION_CALL_WAIT_TIME + randomWaitingStep * 100;
                                 _context4.next = 5;
                                 return new Promise(function (resolve) {
-                                  setTimeout(function () {
-                                    return resolve();
-                                  }, randomWaitTime);
+                                  return setTimeout(resolve, randomWaitTime);
                                 });
                               case 5:
                                 _context4.next = 7;
@@ -2015,9 +2019,9 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
               throw new _SDKError_js__WEBPACK_IMPORTED_MODULE_63__["default"]('externalParty cannot be empty');
             case 9:
               _toHexDigest = function _toHexDigest(hashBuffer) {
-                // convert buffer to byte array
+                // Convert buffer to byte array
                 var hashArray = Array.from(new Uint8Array(hashBuffer));
-                // convert bytes to hex string
+                // Convert bytes to hex string
                 return hashArray.map(function (b) {
                   return b.toString(16).padStart(2, '0');
                 }).join('');
@@ -2348,7 +2352,7 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
         _ref9$prompt = _ref9.prompt,
         prompt = _ref9$prompt === void 0 ? 'select_account' : _ref9$prompt;
       if (_typeof(arguments[0]) !== 'object') {
-        // backward compatibility
+        // Backward compatibility
         state = arguments[0];
         acrValues = arguments[1];
         scope = arguments[2] || scope;
@@ -12140,7 +12144,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var version = '5.0.1-beta.3';
+var version = '5.0.1-beta.4';
 /* harmony default export */ __webpack_exports__["default"] = (version);
 
 /***/ })