@evergis/api 3.0.200 → 3.0.201

package/dist/api.esm.js

@@ -176,14 +176,7 @@ function _get(target, property, receiver) {
 }
 
 const STORAGE_TOKEN_KEY = "evergis-jwt-token";
-const STORAGE_REFRESH_TOKEN_KEY = "evergis-jwt-token";
-
-const parseJwt = token => {
-  const base64Url = token.split(".")[1];
-  const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
-  const jsonPayload = decodeURIComponent(atob(base64).split("").map(c => "%" + "00".concat(c.charCodeAt(0).toString(16)).slice(-2)).join(""));
-  return JSON.parse(jsonPayload);
-};
+const STORAGE_REFRESH_TOKEN_KEY = "evergis-refresh-token";
 
 let HttpClient = /*#__PURE__*/function () {
   function HttpClient(options) {
@@ -204,30 +197,7 @@ let HttpClient = /*#__PURE__*/function () {
     value: function extend(options) {
       var _options$prefixUrl2;
 
-      this.ky = ky.extend(_extends({}, options, {
-        hooks: {
-          beforeRequest: [async request => {
-            const token = window.localStorage.getItem(STORAGE_TOKEN_KEY);
-            const refreshToken = window.localStorage.getItem(STORAGE_REFRESH_TOKEN_KEY);
-
-            if (token) {
-              var _request$headers;
-
-              const {
-                exp
-              } = parseJwt(token) || {};
-
-              if (typeof exp === 'number' && exp - new Date().getTime() < 60 * 1000) {
-                await this.post("/account/refresh-token", {
-                  refreshToken
-                });
-              }
-
-              (_request$headers = request.headers) == null ? void 0 : _request$headers.set('Authorization', "Bearer " + (token || ''));
-            }
-          }]
-        }
-      }));
+      this.ky = ky.extend(options);
       this.prefixUrl = ((_options$prefixUrl2 = options.prefixUrl) == null ? void 0 : _options$prefixUrl2.toString()) || '';
     }
   }, {
@@ -7519,6 +7489,13 @@ let VectorTiles = /*#__PURE__*/function (_VectorTileService) {
   return VectorTiles;
 }(VectorTileService);
 
+const parseJwt = token => {
+  const base64Url = token.split(".")[1];
+  const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+  const jsonPayload = decodeURIComponent(atob(base64).split("").map(c => "%" + "00".concat(c.charCodeAt(0).toString(16)).slice(-2)).join(""));
+  return JSON.parse(jsonPayload);
+};
+
 var UrlPath;
 
 (function (UrlPath) {
@@ -7538,6 +7515,8 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
   var _super = /*#__PURE__*/_createSuper(Api);
 
   function Api(_ref) {
+    var _hooks$beforeRequest;
+
     var _this;
 
     let {
@@ -7561,7 +7540,26 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
       timeout: false
     }, httpOptions || {}, {
       hooks: _extends({}, hooks || {}, {
-        beforeRequest: [...(hooks && hooks.beforeRequest || [])],
+        beforeRequest: [async request => {
+          const token = window.localStorage.getItem(STORAGE_TOKEN_KEY);
+          const refreshToken = window.localStorage.getItem(STORAGE_REFRESH_TOKEN_KEY);
+
+          if (token && refreshToken) {
+            var _request$headers;
+
+            const {
+              exp
+            } = parseJwt(token) || {};
+
+            if (typeof exp === 'number' && exp - new Date().getTime() < 60 * 1000) {
+              await _this.account.refreshToken({
+                refreshToken
+              });
+            }
+
+            (_request$headers = request.headers) == null ? void 0 : _request$headers.set('Authorization', "Bearer " + (token || ''));
+          }
+        }, ...((_hooks$beforeRequest = hooks == null ? void 0 : hooks.beforeRequest) != null ? _hooks$beforeRequest : [])],
         afterResponse: [response => {
           const apiEvent = apiEventsByResponseStatus[response.status];
 
@@ -7570,7 +7568,7 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
           }
 
           return response;
-        }, ...(hooks && hooks.afterResponse || [])]
+        }, ...((hooks == null ? void 0 : hooks.afterResponse) || [])]
       })
     }));
     _this.url = url;