@evergis/api 4.1.52 → 4.1.54

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2025 Everpoint
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2025 Everpoint
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,12 +1,12 @@
-# @evergis/api
-
-Библиотека API.
-
-### Генерирование API
-
-```shell
-$ yarn generate
-```
-
-***ВАЖНО!!!***: Никогда и ни при каких обстоятельствах нельзя вручную править файлы,
-размещенные в директории `src/__generated__`!
+# @evergis/api
+
+Библиотека API.
+
+### Генерирование API
+
+```shell
+$ yarn generate
+```
+
+***ВАЖНО!!!***: Никогда и ни при каких обстоятельствах нельзя вручную править файлы,
+размещенные в директории `src/__generated__`!

package/dist/Api.d.ts

@@ -57,6 +57,7 @@ export declare class Api extends EventEmitter {
     protected readonly http: HttpClient;
     private readonly wsUrl;
     private readonly urlPath;
+    private refreshingToken;
     constructor({ url, wsUrl, wsKeepAlive, snappingHubUrl, http, urlPath, httpOptions, }: ApiParams);
     get isShared(): boolean;
     get isPresentation(): boolean;

package/dist/api.esm.js

@@ -746,7 +746,7 @@ class Account extends AccountService {
         }
         return userInfo;
     }
-    async login(params, authParams = {}, useJwt = false) {
+    async login(params, authParams = {}, useJwt = true) {
         if (params) {
             const response = await super.authenticate(authParams, params);
             if (response && useJwt) {
@@ -2783,6 +2783,7 @@ class Api extends EventEmitter {
     http;
     wsUrl;
     urlPath;
+    refreshingToken = false;
     constructor({ url, wsUrl, wsKeepAlive, snappingHubUrl, http, urlPath, httpOptions, }) {
         super();
         const { hooks } = httpOptions || {};
@@ -2814,6 +2815,12 @@ class Api extends EventEmitter {
                                     retryCount === 1) {
                                     switch (error.response.status) {
                                         case 401:
+                                            if (this.refreshingToken) {
+                                                const currentToken = window.localStorage.getItem(STORAGE_TOKEN_KEY);
+                                                request.headers?.set("Authorization", `Bearer ${currentToken || ""}`);
+                                                return;
+                                            }
+                                            this.refreshingToken = true;
                                             try {
                                                 const refreshToken = window.localStorage.getItem(STORAGE_REFRESH_TOKEN_KEY);
                                                 if (refreshToken) {
@@ -2826,10 +2833,16 @@ class Api extends EventEmitter {
                                                     }
                                                     request.headers?.set("Authorization", `Bearer ${refreshTokenResponse.token || ""}`);
                                                 }
+                                                else {
+                                                    await this.logout();
+                                                }
                                             }
                                             catch (error) {
                                                 await this.logout();
                                             }
+                                            finally {
+                                                this.refreshingToken = false;
+                                            }
                                             break;
                                     }
                                 }