@evergis/api 3.0.200 → 3.0.202

package/dist/api.esm.js

@@ -175,15 +175,9 @@ function _get(target, property, receiver) {
   return _get(target, property, receiver || target);
 }
 
+const API_USER_INFO_KEY = '@evergis/user-info';
 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 +198,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()) || '';
     }
   }, {
@@ -1208,7 +1179,7 @@ let AccountService = /*#__PURE__*/function (_Service) {
   }, {
     key: "refreshToken",
     value: function refreshToken(data) {
-      return this.http.post("/account/refresh-token", data).text();
+      return this.http.post("/account/refresh-token", data).json();
     }
     /**
      * No description
@@ -1439,8 +1410,6 @@ let AccountService = /*#__PURE__*/function (_Service) {
   return AccountService;
 }(Service);
 
-const API_USER_INFO_KEY = '@evergis/user-info';
-
 const getUserInfo = () => JSON.parse(localStorage.getItem(API_USER_INFO_KEY) || 'null') || void 0;
 const updateUserInfo = newUserInfo => {
   if (newUserInfo) {
@@ -4713,6 +4682,13 @@ function isString(v) {
 
 const addSubDomainToLocation = subDomain => window.location.protocol + "//" + subDomain + "." + window.location.host;
 
+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);
+};
+
 function unique(value, index, array) {
   return array.indexOf(value) === index;
 }
@@ -7538,6 +7514,8 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
   var _super = /*#__PURE__*/_createSuper(Api);
 
   function Api(_ref) {
+    var _hooks$beforeRequest;
+
     var _this;
 
     let {
@@ -7561,7 +7539,15 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
       timeout: false
     }, httpOptions || {}, {
       hooks: _extends({}, hooks || {}, {
-        beforeRequest: [...(hooks && hooks.beforeRequest || [])],
+        beforeRequest: [request => {
+          const token = window.localStorage.getItem(STORAGE_TOKEN_KEY);
+
+          if (token) {
+            var _request$headers;
+
+            (_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 +7556,7 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
           }
 
           return response;
-        }, ...(hooks && hooks.afterResponse || [])]
+        }, ...((hooks == null ? void 0 : hooks.afterResponse) || [])]
       })
     }));
     _this.url = url;
@@ -9069,5 +9055,5 @@ var TextVerticalAlignment;
   TextVerticalAlignment["Middle"] = "middle";
 })(TextVerticalAlignment || (TextVerticalAlignment = {}));
 
-export { Account, AccountPreview, AggregationFunction, Api, ApiEvent, AttributeIconType, AttributeSelectorType, AttributeType, AuthorizationGrant, BulkOperations, Cameras, CatalogResourceType, ClassificationType, ClassifyAttributeType, ClientSettings, ConfigurationErrorEnum, ConnectionStatus, DataSourceType, DependencyType, Eql, ErrorDetailsType, ErrorReason, ErrorType, EvergisDynamicLayer, EvergisTileLayer, External, FeatureType, Feedback, FileUpload, Filters, FontStyle, FontWeight, GEOCODE_PROVIDER, General, Geocode, GeometryType, Group, HttpClient, IceRouter, Import, Layers, LayersManager, LineCapStyle, LineEndingType, LineJoinType, Names, Namespace, Notification, NotificationEvent, Operation, OwnerFilter, PbfSchema, Permissions, PolicyType, PortalSettings, Print, Projects, Quality, ResourceCatalog, ResourceSeparator, ResourceSubTypeFilter, ResourceType, ResourceTypeFilter, ResourceTypeLink, Resources, ResponseType, Scheduler, Security, ServerTaskStatus, SimplifyType, SpatialProcessor, Statistic, StringSubType, Styles, Tables, TaskGroup, TextAlignment, TextVerticalAlignment, Tools, UrlPath, VectorTiles, addSubDomainToLocation, errorHandler, formDataFromFile, generateId, isEvergisDynamicLayer, isEvergisTileLayer, isFeatureLayer, isHTTPError, isHandledError, isLayer, isProjectContentItems, isString, isTileLayerService, promiseAllIgnoreErrors, stripUselessSlashes, toFormData, unique };
+export { Account, AccountPreview, AggregationFunction, Api, ApiEvent, AttributeIconType, AttributeSelectorType, AttributeType, AuthorizationGrant, BulkOperations, Cameras, CatalogResourceType, ClassificationType, ClassifyAttributeType, ClientSettings, ConfigurationErrorEnum, ConnectionStatus, DataSourceType, DependencyType, Eql, ErrorDetailsType, ErrorReason, ErrorType, EvergisDynamicLayer, EvergisTileLayer, External, FeatureType, Feedback, FileUpload, Filters, FontStyle, FontWeight, GEOCODE_PROVIDER, General, Geocode, GeometryType, Group, HttpClient, IceRouter, Import, Layers, LayersManager, LineCapStyle, LineEndingType, LineJoinType, Names, Namespace, Notification, NotificationEvent, Operation, OwnerFilter, PbfSchema, Permissions, PolicyType, PortalSettings, Print, Projects, Quality, ResourceCatalog, ResourceSeparator, ResourceSubTypeFilter, ResourceType, ResourceTypeFilter, ResourceTypeLink, Resources, ResponseType, STORAGE_REFRESH_TOKEN_KEY, STORAGE_TOKEN_KEY, Scheduler, Security, ServerTaskStatus, SimplifyType, SpatialProcessor, Statistic, StringSubType, Styles, Tables, TaskGroup, TextAlignment, TextVerticalAlignment, Tools, UrlPath, VectorTiles, addSubDomainToLocation, errorHandler, formDataFromFile, generateId, isEvergisDynamicLayer, isEvergisTileLayer, isFeatureLayer, isHTTPError, isHandledError, isLayer, isProjectContentItems, isString, isTileLayerService, parseJwt, promiseAllIgnoreErrors, stripUselessSlashes, toFormData, unique };
 //# sourceMappingURL=api.esm.js.map