@steroidsjs/core 2.2.91 → 2.2.93

package/components/HttpComponent.d.ts

@@ -10,6 +10,8 @@ interface IHttpRequestOptions {
 export default class HttpComponent {
     accessTokenKey: string;
     apiUrl: string;
+    clientStorageName: string;
+    clientStorageExpiresIn: number;
     _accessToken: any;
     _axios: any;
     _components: any;

package/components/HttpComponent.js

@@ -69,6 +69,8 @@ var HttpComponent = /** @class */ (function () {
             //|| process.env.APP_BACKEND_URL
             || (!process.env.IS_SSR ? window.location.protocol + '//' + window.location.host : '');
         this.accessTokenKey = config.accessTokenKey || 'accessToken';
+        this.clientStorageName = config.clientStorageName || this._components.clientStorage.STORAGE_COOKIE;
+        this.clientStorageExpiresIn = config.clientStorageExpiresIn || 180;
         this._lazyRequests = {};
         this._axios = null;
         this._csrfToken = null;
@@ -101,7 +103,7 @@ var HttpComponent = /** @class */ (function () {
                         }
                         if (!(this._accessToken === false)) return [3 /*break*/, 4];
                         clientStorage = this._components.clientStorage;
-                        tokenValue = clientStorage.get(this.accessTokenKey, clientStorage.STORAGE_COOKIE)
+                        tokenValue = clientStorage.get(this.accessTokenKey, this.clientStorageName)
                             || clientStorage.get(this.accessTokenKey)
                             || null;
                         // client storage method 'get' could be asynchronous
@@ -118,7 +120,7 @@ var HttpComponent = /** @class */ (function () {
                         // client storage method 'get' could be asynchronous
                         _a._accessToken = _b;
                         if (this._accessToken) {
-                            clientStorage.set(this.accessTokenKey, this._accessToken, clientStorage.STORAGE_COOKIE, 180);
+                            clientStorage.set(this.accessTokenKey, this._accessToken, this.clientStorageName, this.clientStorageExpiresIn);
                         }
                         _c.label = 4;
                     case 4:
@@ -140,7 +142,7 @@ var HttpComponent = /** @class */ (function () {
     HttpComponent.prototype.removeAccessToken = function () {
         this._accessToken = null;
         this.resetConfig();
-        this._components.clientStorage.remove(this.accessTokenKey, this._components.clientStorage.STORAGE_COOKIE);
+        this._components.clientStorage.remove(this.accessTokenKey, this.clientStorageName);
     };
     /**
      * @param {string} value
@@ -148,7 +150,7 @@ var HttpComponent = /** @class */ (function () {
     HttpComponent.prototype.setAccessToken = function (value) {
         this._accessToken = value;
         this.resetConfig();
-        this._components.clientStorage.set(this.accessTokenKey, value, this._components.clientStorage.STORAGE_COOKIE, 180);
+        this._components.clientStorage.set(this.accessTokenKey, value, this.clientStorageName, this.clientStorageExpiresIn);
     };
     /**
      * @returns {string}
@@ -161,7 +163,7 @@ var HttpComponent = /** @class */ (function () {
                     case 0:
                         if (!(this._accessToken === false)) return [3 /*break*/, 2];
                         _a = this;
-                        return [4 /*yield*/, this._components.clientStorage.get(this.accessTokenKey)];
+                        return [4 /*yield*/, this._components.clientStorage.get(this.accessTokenKey, this.clientStorageName)];
                     case 1:
                         _a._accessToken = (_b.sent()) || null;
                         _b.label = 2;

package/components/JwtHttpComponent.js

@@ -76,7 +76,7 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                         config = _super.prototype.getAxiosConfig.call(this);
                         if (!!this._refreshToken) return [3 /*break*/, 4];
                         clientStorage = this._components.clientStorage;
-                        tokenValue = clientStorage.get(this.refreshTokenKey, clientStorage.STORAGE_COOKIE)
+                        tokenValue = clientStorage.get(this.refreshTokenKey, this.clientStorageName)
                             || clientStorage.get(this.refreshTokenKey)
                             || null;
                         _a = this;
@@ -91,7 +91,7 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                     case 3:
                         _a._refreshToken = _b;
                         if (this._refreshToken) {
-                            clientStorage.set(this.refreshTokenKey, this._refreshToken, clientStorage.STORAGE_COOKIE, 180);
+                            clientStorage.set(this.refreshTokenKey, this._refreshToken, this.clientStorageName, this.clientStorageExpiresIn);
                         }
                         _c.label = 4;
                     case 4: return [2 /*return*/, config];
@@ -104,20 +104,23 @@ var JwtHttpComponent = /** @class */ (function (_super) {
         axiosInstance.interceptors.response.use(function (config) { return config; }, function (error) { return __awaiter(_this, void 0, void 0, function () {
             var originalRequest, store, response, accessToken;
             var _a;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         originalRequest = error.config;
-                        if (!(error.response.status === 401 && error.config && !error.config._isRetry)) return [3 /*break*/, 2];
+                        if (!(error.response.status === 401
+                            && error.config
+                            && !error.config._isRetry
+                            && originalRequest.url !== this.getUrl((_b = this.refreshTokenRequest) === null || _b === void 0 ? void 0 : _b.url))) return [3 /*break*/, 2];
                         this.removeAccessToken();
                         store = this._components.store;
                         return [4 /*yield*/, this.send(this.refreshTokenRequest.method, this.refreshTokenRequest.url, (_a = {},
                                 _a[this.refreshTokenKey] = this._refreshToken,
                                 _a))];
                     case 1:
-                        response = _c.sent();
-                        accessToken = (_b = response === null || response === void 0 ? void 0 : response.data) === null || _b === void 0 ? void 0 : _b[this.accessTokenKey];
+                        response = _d.sent();
+                        accessToken = (_c = response === null || response === void 0 ? void 0 : response.data) === null || _c === void 0 ? void 0 : _c[this.accessTokenKey];
                         if (accessToken) {
                             this.setAccessToken(accessToken);
                             originalRequest._isRetry = true;
@@ -125,7 +128,7 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                             return [2 /*return*/, axiosInstance.request(originalRequest)];
                         }
                         store.dispatch(auth_1.logout());
-                        _c.label = 2;
+                        _d.label = 2;
                     case 2: throw error;
                 }
             });
@@ -153,12 +156,12 @@ var JwtHttpComponent = /** @class */ (function (_super) {
     JwtHttpComponent.prototype.removeRefreshToken = function () {
         this._refreshToken = null;
         this.resetConfig();
-        this._components.clientStorage.remove(this.refreshTokenKey, this._components.clientStorage.STORAGE_COOKIE);
+        this._components.clientStorage.remove(this.refreshTokenKey, this.clientStorageName);
     };
     JwtHttpComponent.prototype.setRefreshToken = function (value) {
         this._refreshToken = value;
         this.resetConfig();
-        this._components.clientStorage.set(this.refreshTokenKey, value, this._components.clientStorage.STORAGE_COOKIE, 180);
+        this._components.clientStorage.set(this.refreshTokenKey, value, this.clientStorageName, this.clientStorageExpiresIn);
     };
     JwtHttpComponent.prototype.getRefreshToken = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -168,7 +171,7 @@ var JwtHttpComponent = /** @class */ (function (_super) {
                     case 0:
                         if (!(this._refreshToken === false)) return [3 /*break*/, 2];
                         _a = this;
-                        return [4 /*yield*/, this._components.clientStorage.get(this.refreshTokenKey)];
+                        return [4 /*yield*/, this._components.clientStorage.get(this.refreshTokenKey, this.clientStorageName)];
                     case 1:
                         _a._refreshToken = (_b.sent()) || null;
                         _b.label = 2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.2.91",
+  "version": "2.2.93",
   "description": "",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {