shared-ritm 1.3.70 → 1.3.71

package/src/api/settings/ApiService.ts

@@ -1,124 +1,184 @@
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-
-export enum ApiServiceType {
-  SERVICE_AUTH = 'SERVICE_AUTH',
-}
-
-export default class ApiService {
-  private axiosInstance: AxiosInstance
-
-  constructor() {
-    this.axiosInstance = axios.create({
-      baseURL: process.env.VUE_APP_BACKEND,
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
-      },
-    })
-
-    this.axiosInstance.interceptors.request.use(
-      (config: InternalAxiosRequestConfig) => {
-        const token = this.getToken()
-        if (token && config.headers) {
-          config.headers.Authorization = `Bearer ${token}`
-        }
-        return config
-      },
-      (error: AxiosError) => {
-        return Promise.reject(error)
-      },
-    )
-
-    this.axiosInstance.interceptors.response.use(
-      (response: AxiosResponse) => {
-        return response.data
-      },
-      (error: AxiosError) => {
-        if (error.response?.status === 401 || error.response?.status === 403) {
-          this.logout()
-        }
-        return Promise.reject(error)
-      },
-    )
-  }
-
-  private getToken() {
-    return localStorage.getItem('token')
-  }
-
-  private removeToken() {
-    localStorage.removeItem('token')
-  }
-
-  public logout(): void {
-    this.removeToken()
-    window.location.href = '/sign-in'
-  }
-
-  private handleError(error: AxiosError): void {
-    if (error.response) {
-      console.error('API Error:', error.response.status, error.response.data)
-    } else if (error.request) {
-      console.error('No response received:', error.request)
-    } else {
-      console.error('Error during request setup:', error.message)
-    }
-  }
-
-  protected async get<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
-      if (response?.data === false) return false as unknown as T
-
-      return response?.data ?? (response as unknown as T)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      return await this.axiosInstance.delete<T>(url, options)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
-      if (response?.data === false) return false
-      return response?.data || (response as any)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2> {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.patch<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-}
+import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+import { Api_Auth_Login } from '@/api/types/Api_Auth'
+
+// eslint-disable-next-line
+var isRefreshing = false
+// eslint-disable-next-line
+var refreshSubscribers: any[] = []
+
+interface Api_Auth_Refresh {
+  accessToken: string
+}
+
+export enum ApiServiceType {
+  SERVICE_AUTH = 'SERVICE_AUTH',
+}
+
+export default class ApiService {
+  private axiosInstance: AxiosInstance
+
+  constructor() {
+    this.axiosInstance = axios.create({
+      baseURL: process.env.VUE_APP_BACKEND,
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+      },
+      withCredentials: true,
+    })
+
+    this.axiosInstance.interceptors.request.use(
+      (config: InternalAxiosRequestConfig) => {
+        config.headers.Authorization = `Bearer ${this.getAccessToken()}`
+        return config
+      },
+      (error: AxiosError) => {
+        return Promise.reject(error)
+      },
+    )
+
+    this.axiosInstance.interceptors.response.use(
+      (response: AxiosResponse) => {
+        return response.data
+      },
+      async error => {
+        const originalRequest = error.config
+
+        if (
+          error.response?.status !== 401 ||
+          originalRequest.url === '/v2/auth/refresh' ||
+          originalRequest.url === '/v2/login' ||
+          originalRequest._retry
+        ) {
+          return Promise.reject(error)
+        }
+
+        originalRequest._retry = true
+
+        if (isRefreshing) {
+          return new Promise(resolve => {
+            this.subscribeTokenRefresh(() => resolve(this.axiosInstance(originalRequest)))
+          })
+        }
+
+        isRefreshing = true
+
+        try {
+          const response = await this.refresh()
+
+          const newToken = response.accessToken
+          if (!newToken) {
+            this.logoutUser()
+            return Promise.reject(error)
+          }
+
+          this.setAccessToken(newToken)
+          this.onRefreshed()
+          isRefreshing = false
+          return this.axiosInstance(originalRequest)
+        } catch (e) {
+          this.logoutUser()
+          return Promise.reject(e)
+        }
+      },
+    )
+  }
+
+  private setAccessToken(token: string) {
+    localStorage.setItem('token', token)
+  }
+  private getAccessToken() {
+    return localStorage.getItem('token')
+  }
+
+  private removeToken() {
+    localStorage.removeItem('token')
+  }
+
+  private subscribeTokenRefresh(cb: any) {
+    refreshSubscribers.push(cb)
+  }
+
+  private refresh(): Promise<Api_Auth_Refresh> {
+    return this.post<null, Api_Auth_Login>(`/v2/auth/refresh`, null)
+  }
+
+  private onRefreshed() {
+    refreshSubscribers.forEach(cb => cb())
+    refreshSubscribers = []
+  }
+
+  public logoutUser(): any {
+    isRefreshing = false
+    this.post<any, any>(`/v2/logout`, {})
+    this.removeToken()
+    window.location.href = '/sign-in'
+  }
+
+  private handleError(error: AxiosError): void {
+    if (error.response) {
+      console.error('API Error:', error.response.status, error.response.data)
+    } else if (error.request) {
+      console.error('No response received:', error.request)
+    } else {
+      console.error('Error during request setup:', error.message)
+    }
+  }
+
+  protected async get<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
+      if (response?.data === false) return false as unknown as T
+
+      return response?.data ?? (response as unknown as T)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      return await this.axiosInstance.delete<T>(url, options)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
+      if (response?.data === false) return false
+      return response?.data || (response as any)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2> {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.patch<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+}

package/src/api/types/Api_Auth.ts

@@ -1,105 +1,121 @@
-import { Api_User } from '@/api/types/Api_User'
-
-export type LoginPayload = {
-  email: string
-  password: string
-}
-
-export type Api_Auth_User_Education = {
-  created_at: string
-  display_name: string
-  id: string
-  name: string
-}
-
-export type Api_Auth_User_Photo = {
-  id: string
-  name: string
-  path: string
-  type: string
-}
-
-export type Api_Auth_User_Position = {
-  description: string
-  display_name: string
-  id: string
-  name: string
-}
-
-export type Api_User_Roles_Permissions = {
-  created_at: string
-  description: string
-  display_name: string
-  id: string
-  name: string
-  updated_at: string
-}
-
-export type Api_Auth_User_Role = {
-  display_name: string
-  id: string
-  name: string
-  permissions: Api_User_Roles_Permissions[]
-}
-
-export type Api_Auth_User_Team = {
-  display_name: string
-  id: string
-  name: string
-  roles: Api_Auth_User_Role[]
-}
-
-export type Api_Auth_User = {
-  RFID: string
-  avatar_id: null | string
-  avatar_path: null | string
-  dismissal_at: null | string
-  divisions: string
-  educations: Api_Auth_User_Education[]
-  email: string
-  email_verified_at: string
-  first_name: string
-  full_name: string
-  id: string
-  last_name: string
-  passes: any[]
-  patronymic: string
-  personnel_number: number
-  phone: string
-  photos: Api_Auth_User_Photo[]
-  positions: Api_Auth_User_Position[]
-  profession: string
-  roles: Api_Auth_User_Role[]
-  security_warnings: any[]
-  teams: Api_Auth_User_Team[]
-}
-
-export type Api_Auth_Login = {
-  token: string
-  user: Api_Auth_User
-}
-
-export type ChangePasswordPayload = {
-  password: string
-  password_confirmation: string
-}
-
-export type ChangePasswordResponse = Pick<
-  Api_User,
-  | 'id'
-  | 'archiveHistory'
-  | 'assigned_tasks'
-  | 'divisions'
-  | 'email'
-  | 'full_name'
-  | 'passes'
-  | 'personnel_number'
-  | 'phone'
-  | 'photos'
-  | 'positions'
-  | 'responsible_tasks'
-  | 'teams'
-  | 'warehouses'
->
-
-export type ConfigResponse = any
+import { Api_User } from '@/api/types/Api_User'
+
+export type LoginPayload = {
+  email: string
+  password: string
+}
+
+export type Api_Auth_User_Education = {
+  created_at: string
+  display_name: string
+  id: string
+  name: string
+}
+
+export type Api_Auth_User_Photo = {
+  id: string
+  name: string
+  path: string
+  type: string
+}
+
+export type Api_Auth_User_Position = {
+  description: string
+  display_name: string
+  id: string
+  name: string
+}
+
+export type Api_User_Roles_Permissions = {
+  created_at: string
+  description: string
+  display_name: string
+  id: string
+  name: string
+  updated_at: string
+}
+
+export type Api_Auth_User_Role = {
+  display_name: string
+  id: string
+  name: string
+  permissions: Api_User_Roles_Permissions[]
+}
+
+export type Api_Auth_User_Team = {
+  display_name: string
+  id: string
+  name: string
+  roles: Api_Auth_User_Role[]
+}
+
+export type Api_Auth_User = {
+  RFID: string
+  avatar_id: null | string
+  avatar_path: null | string
+  dismissal_at: null | string
+  divisions: string
+  educations: Api_Auth_User_Education[]
+  email: string
+  email_verified_at: string
+  first_name: string
+  full_name: string
+  id: string
+  last_name: string
+  passes: any[]
+  patronymic: string
+  personnel_number: number
+  phone: string
+  photos: Api_Auth_User_Photo[]
+  positions: Api_Auth_User_Position[]
+  profession: string
+  roles: Api_Auth_User_Role[]
+  security_warnings: any[]
+  teams: Api_Auth_User_Team[]
+  avatar: null
+  change_password: null
+  created_at: string
+  deleted_at: null
+  face_recognition_id: null
+  password_change_available_at: string
+  password_change_due_at: string
+  password_last_changed_at: string
+  updated_at: string
+}
+
+export type Api_Auth_Login = {
+  token: string
+  user: Api_Auth_User
+}
+
+export type ChangePasswordPayload = {
+  password: string
+  password_confirmation: string
+}
+
+export type ChangePasswordAndActivatePayload = {
+  email: string
+  currentPassword: string
+  password: string
+  passwordConfirmation: string
+}
+
+export type ChangePasswordResponse = Pick<
+  Api_User,
+  | 'id'
+  | 'archiveHistory'
+  | 'assigned_tasks'
+  | 'divisions'
+  | 'email'
+  | 'full_name'
+  | 'passes'
+  | 'personnel_number'
+  | 'phone'
+  | 'photos'
+  | 'positions'
+  | 'responsible_tasks'
+  | 'teams'
+  | 'warehouses'
+>
+
+export type ConfigResponse = any

package/src/api/types/Api_Metrics.ts

@@ -1,26 +1,26 @@
-export type Api_Metrics_Unused_Personnel = {
-  position_name: string | null
-  brigade_name: string | null
-  full_name: string | null
-}
-
-export type Api_Metrics_Personnel_Plan_User = {
-  user_id: string
-  full_name: string
-  position_id: string
-  position_name: string
-  position_display_name: string
-}
-
-export type Api_Metrics_Personnel_Plan_Position = {
-  position_id: string
-  position_name: string
-  position_display_name: string
-  count: number
-}
-
-export type Api_Metrics_Personnel_Plan = {
-  engaged: Api_Metrics_Personnel_Plan_User[]
-  fixed_repair: Api_Metrics_Personnel_Plan_Position[]
-  ready: Api_Metrics_Personnel_Plan_User[]
-}
+export type Api_Metrics_Unused_Personnel = {
+  position_name: string | null
+  brigade_name: string | null
+  full_name: string | null
+}
+
+export type Api_Metrics_Personnel_Plan_User = {
+  user_id: string
+  full_name: string
+  position_id: string
+  position_name: string
+  position_display_name: string
+}
+
+export type Api_Metrics_Personnel_Plan_Position = {
+  position_id: string
+  position_name: string
+  position_display_name: string
+  count: number
+}
+
+export type Api_Metrics_Personnel_Plan = {
+  engaged: Api_Metrics_Personnel_Plan_User[]
+  fixed_repair: Api_Metrics_Personnel_Plan_Position[]
+  ready: Api_Metrics_Personnel_Plan_User[]
+}