shared-ritm 1.3.50 → 1.3.52

package/dist/types/api/settings/ApiService.d.ts

@@ -4,12 +4,16 @@ export declare enum ApiServiceType {
 }
 export default class ApiService {
     private axiosInstance;
-    private isRefresh;
+    private access_token;
+    private isRefreshing;
+    private refreshSubscribers;
     constructor();
     private setAccessToken;
     private getAccessToken;
     private removeToken;
+    private subscribeTokenRefresh;
     private refresh;
+    private onRefreshed;
     logoutUser(): any;
     private handleError;
     protected get<T>(url: string, options?: AxiosRequestConfig): Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.3.50",
+  "version": "1.3.52",
   "private": false,
   "files": [
     "dist",

package/src/api/settings/ApiService.ts

@@ -12,9 +12,14 @@ export enum ApiServiceType {
 export default class ApiService {
   private axiosInstance: AxiosInstance
 
-  private isRefresh = false
+  private access_token: string | null = null
+
+  private isRefreshing = false
+  private refreshSubscribers: any[] = []
 
   constructor() {
+    this.access_token = this.getAccessToken()
+
     this.axiosInstance = axios.create({
       baseURL: process.env.VUE_APP_BACKEND,
       headers: {
@@ -26,9 +31,8 @@ export default class ApiService {
 
     this.axiosInstance.interceptors.request.use(
       (config: InternalAxiosRequestConfig) => {
-        const access_token = this.getAccessToken()
-        if (access_token && config.headers) {
-          config.headers.Authorization = `Bearer ${access_token}`
+        if (this.access_token && config.headers) {
+          config.headers.Authorization = `Bearer ${this.access_token}`
         }
         return config
       },
@@ -44,28 +48,46 @@ export default class ApiService {
       async error => {
         const originalRequest = error.config
 
-        if (originalRequest?._retry) {
-          throw error
+        if (error.response?.status !== 401) {
+          return Promise.reject(error)
         }
 
-        if (error.response?.status === 401 || error.response?.status === 403) {
-          if (!this.getAccessToken()) return Promise.reject(error)
-          if (!this.isRefresh) {
-            originalRequest._retry = true
-            this.isRefresh = true
-            return this.refresh().then(response => {
-              if (!response?.accessToken) {
-                this.logoutUser()
-              }
-              if (response?.accessToken) {
-                this.setAccessToken(response.accessToken)
-              }
-              return this.axiosInstance(originalRequest)
-            })
+        if (originalRequest._retry) {
+          return Promise.reject(error)
+        }
+
+        originalRequest._retry = true
+
+        if (this.isRefreshing) {
+          return new Promise(resolve => {
+            this.subscribeTokenRefresh(() => resolve(this.axiosInstance(originalRequest)))
+          })
+        }
+
+        this.isRefreshing = true
+
+        try {
+          const response = await this.refresh()
+
+          const newToken = response.accessToken
+          console.log(newToken)
+          if (!newToken) {
+            this.logoutUser()
+            return Promise.reject(error)
           }
-          return this.logoutUser()
+
+          this.setAccessToken(newToken)
+
+          this.onRefreshed(newToken)
+          this.isRefreshing = false
+
+          originalRequest.headers['Authorization'] = `Bearer ${newToken}`
+          return this.axiosInstance(originalRequest)
+        } catch (e) {
+          this.isRefreshing = false
+          this.logoutUser()
+          return Promise.reject(e)
         }
-        return Promise.reject(error)
       },
     )
   }
@@ -81,10 +103,19 @@ export default class ApiService {
     localStorage.removeItem('token')
   }
 
+  private subscribeTokenRefresh(cb: any) {
+    this.refreshSubscribers.push(cb)
+  }
+
   private refresh(): Promise<Api_Auth_Refresh> {
     return this.post<null, Api_Auth_Login>(`/v2/auth/refresh`, null)
   }
 
+  private onRefreshed(token: string) {
+    this.refreshSubscribers.forEach(cb => cb(token))
+    this.refreshSubscribers = []
+  }
+
   public logoutUser(): any {
     this.post<any, any>(`/v2/logout`, {})
     this.removeToken()