@stemy/ngx-utils 12.2.18 → 12.2.20

package/bundles/stemy-ngx-utils.umd.js

@@ -3211,8 +3211,8 @@
                         // If we use token auth
                         if (_this.client.renewTokenFunc && headers.has(authKey)) {
                             var currentTime = new Date().getTime();
-                            var userTokenTime = _this.storage.get("userTokenTime") || currentTime;
-                            // And the last request was a long long time ago
+                            var userTokenTime = _this.getUserTokenTime() || currentTime;
+                            // And the last request was a long-long time ago
                             if (currentTime - 600000 > userTokenTime) {
                                 _this.client.renewTokenFunc();
                             }
@@ -3224,7 +3224,7 @@
                         }
                         var headers = options.headers;
                         var authKey = "Authorization";
-                        // If an authorization header exists and we still have an Unauthorized response prompt the user to log in again
+                        // If an authorization header exists, and we still have an Unauthorized response prompt the user to log in again
                         if (headers.has(authKey) && response.status == 401) {
                             var pushed = _this.pushFailedRequest(url, options, function () {
                                 options.headers = _this.makeHeaders(options.originalHeaders);
@@ -3239,6 +3239,9 @@
                 });
             });
         };
+        BaseHttpService.prototype.getUserTokenTime = function () {
+            return this.storage.get("userTokenTime");
+        };
         BaseHttpService.prototype.pushFailedRequest = function (url, options, req) {
             if (url.indexOf("tokens") >= 0)
                 return false;
@@ -3283,13 +3286,8 @@
         };
         BaseHttpService.prototype.absoluteUrl = function (url, options) {
             return __awaiter(this, void 0, void 0, function () {
-                var absoluteUrl;
                 return __generator(this, function (_c) {
-                    absoluteUrl = this.parseUrl(url);
-                    if (url == "api-docs") {
-                        return [2 /*return*/, absoluteUrl.replace("/api", "")];
-                    }
-                    return [2 /*return*/, absoluteUrl];
+                    return [2 /*return*/, this.parseUrl(url)];
                 });
             });
         };
@@ -3328,7 +3326,11 @@
             configurable: true
         });
         ApiService.prototype.url = function (url) {
-            return this.expressRequestUrl("/api/" + url);
+            var baseUrl = this.expressRequestUrl("/api/" + url);
+            if (url == "api-docs" || url == "socket") {
+                return baseUrl.replace("/api/", "/");
+            }
+            return baseUrl;
         };
         ApiService.prototype.get = function (url, options, body) {
             return this.getPromise(url, options, body);