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

package/es5/index.js

@@ -1107,6 +1107,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 * 60 * 5;
 var globalWindow = function globalWindow() {
   return window;
 };
@@ -1159,10 +1161,6 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
     _this.log = log;
     _this.callbackBeforeRedirect = callbackBeforeRedirect;
     _this._sessionDomain = sessionDomain;
-    if (_this._enableSessionCaching) {
-      var expiresIn = 1000 * 300;
-      _this.cache.set("sessionFlowOngoing", false, expiresIn);
-    }
 
     // Internal hack: set to false to always refresh from hassession
     _this._enableSessionCaching = true;
@@ -1174,16 +1172,60 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
     _this._setBffServerUrl(env);
     _this._setOauthServerUrl(env);
     _this._setGlobalSessionServiceUrl(env);
+    _this._unblockSessionCall();
     return _this;
   }
 
   /**
-   * Set SPiD server URL
+   * Checks if getting session is blocked
    * @private
-   * @param {string} url - real URL or 'PRE' style key
-   * @returns {void}
+   *
+   * @returns {boolean|void}
    */
   _createClass(Identity, [{
+    key: "_isSessionCallBlocked",
+    value: function _isSessionCallBlocked() {
+      if (this._enableSessionCaching) {
+        return this.cache.get(SESSION_CALL_BLOCKED_CACHE_KEY);
+      }
+    }
+
+    /**
+     * Block calls to get session
+     * @private
+     *
+     * @returns {void}
+     */
+  }, {
+    key: "_blockSessionCall",
+    value: function _blockSessionCall() {
+      if (this._enableSessionCaching) {
+        var SESSION_CALL_BLOCKED = true;
+        this.cache.set(SESSION_CALL_BLOCKED_CACHE_KEY, SESSION_CALL_BLOCKED, SESSION_CALL_BLOCKED_TTL);
+      }
+    }
+
+    /**
+     * Unblocks calls to get session
+     * @private
+     *
+     * @returns {void}
+     */
+  }, {
+    key: "_unblockSessionCall",
+    value: function _unblockSessionCall() {
+      if (this._enableSessionCaching) {
+        this.cache.delete(SESSION_CALL_BLOCKED_CACHE_KEY);
+      }
+    }
+
+    /**
+     * Set SPiD server URL
+     * @private
+     * @param {string} url - real URL or 'PRE' style key
+     * @returns {void}
+     */
+  }, {
     key: "_setSpidServerUrl",
     value: function _setSpidServerUrl(url) {
       Object(_validate_js__WEBPACK_IMPORTED_MODULE_55__["assert"])(Object(_validate_js__WEBPACK_IMPORTED_MODULE_55__["isStr"])(url), "url parameter is invalid: ".concat(url));
@@ -1486,8 +1528,8 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
     key: "hasSession",
     value: function hasSession() {
       var _this2 = this;
-      var checkIfSessionOngoing = this.cache.get("sessionFlowOngoing");
-      if (checkIfSessionOngoing) {
+      var isSessionCallBlocked = this._isSessionCallBlocked();
+      if (isSessionCallBlocked) {
         return this._session;
       }
       if (this._hasSessionInProgress) {
@@ -1509,7 +1551,7 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
       };
       var _getSession = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-          var cachedSession, sessionData, expiresIn, _expiresIn, _expiresIn2;
+          var cachedSession, sessionData, expiresIn, _expiresIn;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -1552,18 +1594,15 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
                   _context.next = 21;
                   break;
                 }
-                if (_this2._enableSessionCaching) {
-                  _expiresIn = 1000 * 300;
-                  _this2.cache.set("sessionFlowOngoing", true, _expiresIn);
-                }
+                _this2._blockSessionCall();
                 _context.next = 20;
                 return _this2.callbackBeforeRedirect();
               case 20:
                 return _context.abrupt("return", _this2._sessionService.makeUrl(sessionData.redirectURL));
               case 21:
                 if (_this2._enableSessionCaching) {
-                  _expiresIn2 = 1000 * (sessionData.expiresIn || 300);
-                  _this2.cache.set(HAS_SESSION_CACHE_KEY, sessionData, _expiresIn2);
+                  _expiresIn = 1000 * (sessionData.expiresIn || 300);
+                  _this2.cache.set(HAS_SESSION_CACHE_KEY, sessionData, _expiresIn);
                 }
               case 22:
                 return _context.abrupt("return", _postProcess(sessionData));
@@ -1579,7 +1618,7 @@ var Identity = /*#__PURE__*/function (_EventEmitter) {
       }();
       this._hasSessionInProgress = _getSession().then(function (sessionData) {
         _this2._hasSessionInProgress = false;
-        if (typeof sessionData === 'string' && Object(_validate_js__WEBPACK_IMPORTED_MODULE_55__["isUrl"])(sessionData)) {
+        if (Object(_validate_js__WEBPACK_IMPORTED_MODULE_55__["isUrl"])(sessionData)) {
           return _this2.window.location.href = sessionData;
         }
         return sessionData;
@@ -11944,7 +11983,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var version = '4.8.7-beta.6';
+var version = '4.8.7-beta.8';
 /* harmony default export */ __webpack_exports__["default"] = (version);
 
 /***/ }),