@schibsted/account-sdk-browser 5.0.1-beta → 5.0.1-beta.2

package/es5/identity.js

@@ -1102,7 +1102,8 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 var HAS_SESSION_CACHE_KEY = 'hasSession-cache';
 var SESSION_CALL_BLOCKED_CACHE_KEY = 'sessionCallBlocked-cache';
-var SESSION_CALL_BLOCKED_TTL = 1000 * 30;
+var SESSION_CALL_BLOCKED_TTL = 1000 * 30; //set to 30s, the default period for a request timeout
+
 var TAB_ID_KEY = 'tab-id-cache';
 var TAB_ID = Math.floor(Math.random() * 100000);
 var TAB_ID_TTL = 1000 * 60 * 60 * 24 * 30;
@@ -1153,8 +1154,12 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
     _this._sessionInitiatedSent = false;
     _this.window = window;
     _this.clientId = clientId;
-    _this.sessionStorageCache = new _cache_js__WEBPACK_IMPORTED_MODULE_60__["default"](_this.window && _this.window.sessionStorage);
-    _this.localStorageCache = new _cache_js__WEBPACK_IMPORTED_MODULE_60__["default"](_this.window && _this.window.localStorage);
+    _this.sessionStorageCache = new _cache_js__WEBPACK_IMPORTED_MODULE_60__["default"](function () {
+      return _this.window && _this.window.sessionStorage;
+    });
+    _this.localStorageCache = new _cache_js__WEBPACK_IMPORTED_MODULE_60__["default"](function () {
+      return _this.window && _this.window.localStorage;
+    });
     _this.redirectUri = redirectUri;
     _this.env = env;
     _this.log = log;
@@ -1536,10 +1541,6 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
     key: "hasSession",
     value: function hasSession() {
       var _this2 = this;
-      var isSessionCallBlocked = this._isSessionCallBlocked();
-      if (isSessionCallBlocked) {
-        return this._session;
-      }
       if (this._hasSessionInProgress) {
         return this._hasSessionInProgress;
       }
@@ -1575,19 +1576,26 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
                 }
                 return _context.abrupt("return", _postProcess(cachedSession));
               case 4:
+                if (!_this2._isSessionCallBlocked()) {
+                  _context.next = 6;
+                  break;
+                }
+                return _context.abrupt("return", _this2._session);
+              case 6:
                 sessionData = null;
-                _context.prev = 5;
-                _context.next = 8;
+                _context.prev = 7;
+                _this2._blockSessionCall();
+                _context.next = 11;
                 return _this2._sessionService.get('/v2/session', {
                   tabId: _this2._tabId
                 });
-              case 8:
+              case 11:
                 sessionData = _context.sent;
-                _context.next = 15;
+                _context.next = 18;
                 break;
-              case 11:
-                _context.prev = 11;
-                _context.t0 = _context["catch"](5);
+              case 14:
+                _context.prev = 14;
+                _context.t0 = _context["catch"](7);
                 if (_context.t0 && _context.t0.code === 400 && _this2._enableSessionCaching) {
                   expiresIn = 1000 * (_context.t0.expiresIn || 300);
                   _this2.sessionStorageCache.set(HAS_SESSION_CACHE_KEY, {
@@ -1595,34 +1603,33 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
                   }, expiresIn);
                 }
                 throw _context.t0;
-              case 15:
+              case 18:
                 if (!sessionData) {
-                  _context.next = 22;
+                  _context.next = 24;
                   break;
                 }
                 if (!_checkRedirectionNeed(sessionData)) {
-                  _context.next = 21;
+                  _context.next = 23;
                   break;
                 }
-                _this2._blockSessionCall();
-                _context.next = 20;
+                _context.next = 22;
                 return _this2.callbackBeforeRedirect();
-              case 20:
-                return _context.abrupt("return", _this2._sessionService.makeUrl(sessionData.redirectURL, {
+              case 22:
+                _this2.window.location.href = _this2._sessionService.makeUrl(sessionData.redirectURL, {
                   tabId: _this2._getTabId()
-                }));
-              case 21:
+                });
+              case 23:
                 if (_this2._enableSessionCaching) {
                   _expiresIn = 1000 * (sessionData.expiresIn || 300);
                   _this2.sessionStorageCache.set(HAS_SESSION_CACHE_KEY, sessionData, _expiresIn);
                 }
-              case 22:
+              case 24:
                 return _context.abrupt("return", _postProcess(sessionData));
-              case 23:
+              case 25:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[5, 11]]);
+          }, _callee, null, [[7, 14]]);
         }));
         return function _getSession() {
           return _ref2.apply(this, arguments);
@@ -1630,15 +1637,13 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
       }();
       this._hasSessionInProgress = _getSession().then(function (sessionData) {
         _this2._hasSessionInProgress = false;
-        if (Object(_validate_js__WEBPACK_IMPORTED_MODULE_55__["isUrl"])(sessionData)) {
-          return _this2.window.location.href = sessionData;
-        }
         return sessionData;
       }, function (err) {
         _this2.emit('error', err);
         _this2._hasSessionInProgress = false;
         throw new _SDKError_js__WEBPACK_IMPORTED_MODULE_63__["default"]('HasSession failed', err);
       });
+      this._unblockSessionCallByTab();
       return this._hasSessionInProgress;
     }
 
@@ -11992,7 +11997,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var version = '5.0.1-beta';
+var version = '5.0.1-beta.2';
 /* harmony default export */ __webpack_exports__["default"] = (version);
 
 /***/ })