@evergis/api 4.1.51 → 4.1.53

package/dist/index.js

@@ -747,7 +747,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) {
@@ -2784,11 +2784,10 @@ class Api extends EventEmitter {
     http;
     wsUrl;
     urlPath;
-    refreshingToken;
+    refreshingToken = false;
     constructor({ url, wsUrl, wsKeepAlive, snappingHubUrl, http, urlPath, httpOptions, }) {
         super();
         const { hooks } = httpOptions || {};
-        this.refreshingToken = false;
         this.http =
             http ||
                 new HttpClient({
@@ -2817,10 +2816,15 @@ 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 (!this.refreshingToken && refreshToken) {
-                                                    this.refreshingToken = true;
+                                                if (refreshToken) {
                                                     const refreshTokenResponse = await this.account.refreshToken({
                                                         refreshToken,
                                                     });
@@ -2829,12 +2833,17 @@ class Api extends EventEmitter {
                                                         window.localStorage.setItem(STORAGE_REFRESH_TOKEN_KEY, refreshTokenResponse.refreshToken);
                                                     }
                                                     request.headers?.set("Authorization", `Bearer ${refreshTokenResponse.token || ""}`);
-                                                    this.refreshingToken = false;
+                                                }
+                                                else {
+                                                    await this.logout();
                                                 }
                                             }
                                             catch (error) {
                                                 await this.logout();
                                             }
+                                            finally {
+                                                this.refreshingToken = false;
+                                            }
                                             break;
                                     }
                                 }