shared-ritm 1.3.96 → 1.3.98

package/src/api/settings/ApiService.ts

@@ -1,185 +1,184 @@
-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`, null).then(() => {
-      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`, null)
+    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_Brigades.ts

@@ -1,36 +1,36 @@
-import { Api_User, Api_User_Team_Search } from '@/api/types/Api_User'
-import { Api_Tasks_Position_Dto } from '@/api/types/Api_Tasks'
-
-export type Api_Brigade_Master = {
-  id: string
-  full_name: string
-  email: string
-}
-
-export type Api_Brigade_Position = {
-  id: string
-  user: Pick<Api_User, 'id' | 'first_name' | 'last_name' | 'patronymic' | 'email' | 'full_name'> | null
-  position: Api_Tasks_Position_Dto
-}
-
-export type Api_Brigade = {
-  id: string
-  name: string
-  task_master: Api_Brigade_Master
-  teams: Api_User_Team_Search[]
-  positions: Api_Brigade_Position[]
-}
-
-export type Api_Brigade_Create = Pick<Api_Brigade, 'name' | 'teams'> & {
-  positions?: Api_Brigade_Position[]
-  task_master_user_id: string
-}
-
-export type Api_Brigade_Search = {
-  id: string
-  name: string
-  created_at: string
-  updated_at: string
-  task_master: Api_Brigade_Master
-  teams: Api_User_Team_Search[]
-}
+import { Api_User, Api_User_Team_Search } from '@/api/types/Api_User'
+import { Api_Tasks_Position_Dto } from '@/api/types/Api_Tasks'
+
+export type Api_Brigade_Master = {
+  id: string
+  full_name: string
+  email: string
+}
+
+export type Api_Brigade_Position = {
+  id: string
+  user: Pick<Api_User, 'id' | 'first_name' | 'last_name' | 'patronymic' | 'email' | 'full_name'> | null
+  position: Api_Tasks_Position_Dto
+}
+
+export type Api_Brigade = {
+  id: string
+  name: string
+  task_master: Api_Brigade_Master
+  teams: Api_User_Team_Search[]
+  positions: Api_Brigade_Position[]
+}
+
+export type Api_Brigade_Create = Pick<Api_Brigade, 'name' | 'teams'> & {
+  positions?: Api_Brigade_Position[]
+  task_master_user_id: string
+}
+
+export type Api_Brigade_Search = {
+  id: string
+  name: string
+  created_at: string
+  updated_at: string
+  task_master: Api_Brigade_Master
+  teams: Api_User_Team_Search[]
+}

package/src/api/types/Api_Comment.ts

@@ -1,40 +1,40 @@
-export type FileRequest = {
-  name: string
-  type: string
-  path: string
-  extension: string
-  id: string
-}
-
-export type Api_Comment_Dto = {
-  created_at: string
-  files: FileRequest[]
-  first_name: string
-  for_status: boolean
-  full_name: string
-  id: string
-  last_name: string
-  text: string
-  user_id: string
-  user_name: string
-}
-
-export type Api_Comment_Request_Dto = {
-  for_status?: boolean
-  task_id?: string
-  text?: string
-  type_id?: string
-  files?: string[]
-}
-
-export type Api_Comment_Update_Dto = {
-  created_at: string
-  files: FileRequest[]
-  for_status: false
-  id: string
-  text: string
-  type: string | null
-  type_id: string | null
-  updated_at: string
-  user_id: string
-}
+export type FileRequest = {
+  name: string
+  type: string
+  path: string
+  extension: string
+  id: string
+}
+
+export type Api_Comment_Dto = {
+  created_at: string
+  files: FileRequest[]
+  first_name: string
+  for_status: boolean
+  full_name: string
+  id: string
+  last_name: string
+  text: string
+  user_id: string
+  user_name: string
+}
+
+export type Api_Comment_Request_Dto = {
+  for_status?: boolean
+  task_id?: string
+  text?: string
+  type_id?: string
+  files?: string[]
+}
+
+export type Api_Comment_Update_Dto = {
+  created_at: string
+  files: FileRequest[]
+  for_status: false
+  id: string
+  text: string
+  type: string | null
+  type_id: string | null
+  updated_at: string
+  user_id: string
+}

package/src/api/types/Api_Files.ts

@@ -1,7 +1,7 @@
-export type Api_Files_Responsible_Dto = {
-  name: string
-  type: string
-  path: string
-  extension: string
-  id: string
-}
+export type Api_Files_Responsible_Dto = {
+  name: string
+  type: string
+  path: string
+  extension: string
+  id: string
+}