@evergis/api 3.0.201 → 3.0.203

package/dist/api.esm.js

@@ -175,6 +175,7 @@ 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-refresh-token";
 
@@ -1178,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
@@ -1409,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) {
@@ -1434,18 +1433,18 @@ let Account = /*#__PURE__*/function (_AccountService) {
 
   _createClass(Account, [{
     key: "login",
-    value: function login(params, authParams) {
+    value: async function login(params, authParams) {
       if (authParams === void 0) {
         authParams = {};
       }
 
       if (params) {
-        _get(_getPrototypeOf(Account.prototype), "authenticate", this).call(this, authParams, params).then(resonse => {
-          if (resonse) {
-            window.localStorage.setItem(STORAGE_TOKEN_KEY, resonse.token);
-            window.localStorage.setItem(STORAGE_REFRESH_TOKEN_KEY, resonse.refreshToken);
-          }
-        });
+        const response = await _get(_getPrototypeOf(Account.prototype), "authenticate", this).call(this, authParams, params);
+
+        if (response) {
+          window.localStorage.setItem(STORAGE_TOKEN_KEY, response.token);
+          window.localStorage.setItem(STORAGE_REFRESH_TOKEN_KEY, response.refreshToken);
+        }
       }
     }
   }, {
@@ -4683,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;
 }
@@ -7489,13 +7495,6 @@ 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) {
@@ -7540,23 +7539,12 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
       timeout: false
     }, httpOptions || {}, {
       hooks: _extends({}, hooks || {}, {
-        beforeRequest: [async request => {
+        beforeRequest: [request => {
           const token = window.localStorage.getItem(STORAGE_TOKEN_KEY);
-          const refreshToken = window.localStorage.getItem(STORAGE_REFRESH_TOKEN_KEY);
 
-          if (token && refreshToken) {
+          if (token) {
             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 : [])],
@@ -7631,7 +7619,7 @@ let Api = /*#__PURE__*/function (_EventEmitter) {
       } = _ref2;
 
       try {
-        this.account.login(authParams, authQueryParams);
+        await this.account.login(authParams, authQueryParams);
 
         if (fetchUser) {
           await this.account.fetchCurrentUser();
@@ -9067,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