shared-ritm 1.3.42 → 1.3.44

package/dist/types/api/services/AuthService.d.ts

@@ -2,7 +2,6 @@ import ApiService from '../settings/ApiService';
 import { Api_Auth_Login, ChangePasswordResponse, ConfigResponse } from '@/api/types/Api_Auth';
 declare class AuthService extends ApiService {
     login(email: string, password: string): Promise<Api_Auth_Login>;
-    refresh(email: string, password: string): Promise<Api_Auth_Login>;
     loginPhoto(photo: any): Promise<Api_Auth_Login>;
     loginVideo(data: any): Promise<Api_Auth_Login>;
     logout(): Promise<Api_Auth_Login>;

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

@@ -4,10 +4,12 @@ export declare enum ApiServiceType {
 }
 export default class ApiService {
     private axiosInstance;
+    private isRefresh;
     constructor();
     private getToken;
     private removeToken;
-    logout(): void;
+    private refresh;
+    logoutUser(): any;
     private handleError;
     protected get<T>(url: string, options?: AxiosRequestConfig): Promise<T>;
     protected delete<T>(url: string, options?: AxiosRequestConfig): Promise<AxiosResponse<T, any, {}>>;

package/package.json

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

package/src/api/services/AuthService.ts

@@ -15,13 +15,6 @@ class AuthService extends ApiService {
     })
   }
 
-  public refresh(email: string, password: string): Promise<Api_Auth_Login> {
-    return this.post<LoginPayload, Api_Auth_Login>(`/v2/auth/refresh`, {
-      email,
-      password,
-    })
-  }
-
   public loginPhoto(photo: any): Promise<Api_Auth_Login> {
     return this.post<any, Api_Auth_Login>(`/login/from_photo`, { photo })
   }
@@ -33,7 +26,7 @@ class AuthService extends ApiService {
   }
 
   public logout(): Promise<Api_Auth_Login> {
-    return this.post<null, Api_Auth_Login>(`/v2/logout`, null)
+    return this.logoutUser()
   }
 
   public userInfo() {

package/src/api/settings/ApiService.ts

@@ -1,4 +1,9 @@
 import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+import { Api_Auth_Login } from '@/api/types/Api_Auth'
+
+interface Api_Auth_Refresh {
+  accessToken: string
+}
 
 export enum ApiServiceType {
   SERVICE_AUTH = 'SERVICE_AUTH',
@@ -7,6 +12,8 @@ export enum ApiServiceType {
 export default class ApiService {
   private axiosInstance: AxiosInstance
 
+  private isRefresh = false
+
   constructor() {
     this.axiosInstance = axios.create({
       baseURL: process.env.VUE_APP_BACKEND,
@@ -34,9 +41,24 @@ export default class ApiService {
       (response: AxiosResponse) => {
         return response.data
       },
-      (error: AxiosError) => {
+      async (error: AxiosError) => {
         if (error.response?.status === 401 || error.response?.status === 403) {
-          this.logout()
+          if (!!this.getToken() && !this.isRefresh) {
+            this.isRefresh = true
+            return this.refresh().then(response => {
+              if (!response?.accessToken) {
+                alert('logout')
+                console.log(response)
+                return this.logoutUser()
+              }
+              if (response?.accessToken) {
+                console.log(response)
+                alert('da')
+                return true
+              }
+            })
+          }
+          return this.logoutUser()
         }
         return Promise.reject(error)
       },
@@ -51,9 +73,15 @@ export default class ApiService {
     localStorage.removeItem('token')
   }
 
-  public logout(): void {
+  private refresh(): Promise<Api_Auth_Refresh> {
+    return this.post<null, Api_Auth_Login>(`/v2/auth/refresh`, null)
+  }
+
+  public logoutUser(): any {
+    this.post<null, any>(`/v2/logout`, null)
     this.removeToken()
     window.location.href = '/sign-in'
+    return {} as any
   }
 
   private handleError(error: AxiosError): void {