shared-ritm 1.3.70 → 1.3.72

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

@@ -8,6 +8,7 @@ declare class AuthService extends ApiService {
     userInfo(): Promise<any>;
     configs(): Promise<ConfigResponse>;
     changePassword(id: string, password: string, password_confirmation: string): Promise<ChangePasswordResponse>;
+    changePasswordAndActivate(email: string, currentPassword: string, password: string, passwordConfirmation: string): Promise<any>;
 }
 export default function useAuthService(): AuthService;
 export {};

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

@@ -1,6 +1,6 @@
 import ApiService from '../settings/ApiService';
 import { ResponseApi } from '../types/Api_Service';
-import { Api_Metrics_Personnel_Plan, Api_Metrics_Unused_Personnel } from '@/api/types/Api_Metrics';
+import { Api_Metrics_Personnel_Plan, Api_Metrics_Personnel_Plan_Project, Api_Metrics_Personnel_Plan_Project_Body, Api_Metrics_Unused_Personnel } from '@/api/types/Api_Metrics';
 declare class MetricsService extends ApiService {
     fetchPieProjects(queryString: string): Promise<ResponseApi<any>>;
     fetchPieTasks(queryString: string): Promise<ResponseApi<any>>;
@@ -31,6 +31,7 @@ declare class MetricsService extends ApiService {
     fetchPieAllTasks(queryString: string): Promise<any>;
     fetchPieAllTasksInfo(queryString: string): Promise<any>;
     fetchPersonnelPlan(params: any): Promise<Api_Metrics_Personnel_Plan>;
+    fetchPersonnelPlanProjects(body: Api_Metrics_Personnel_Plan_Project_Body): Promise<Api_Metrics_Personnel_Plan_Project[]>;
 }
 export default function useMetricsService(): MetricsService;
 export {};

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

@@ -0,0 +1,15 @@
+import ApiService from '../settings/ApiService';
+import { Api_User_Issue, Api_User_Issue_Body, Api_User_Issue_List_Item, Api_User_Issue_Properties } from '@/api/types/Api_User_Issue';
+import { ResponseApi } from '@/api/types/Api_Service';
+declare class UserIssueService extends ApiService {
+    createUserIssue(body: Api_User_Issue_Body): Promise<Api_User_Issue_List_Item>;
+    getUserIssue(id: string): Promise<Api_User_Issue>;
+    getUserIssueList(params: any): Promise<ResponseApi<Api_User_Issue_List_Item>>;
+    getProperties(): Promise<Api_User_Issue_Properties>;
+    deleteUserIssue(id: string): Promise<{
+        data: boolean;
+        status: number;
+    }>;
+}
+export default function useUserIssueService(): UserIssueService;
+export {};

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

@@ -1,5 +1,5 @@
 import ApiService from '../settings/ApiService';
-import { Api_User, Api_User_Create, Api_User_Delete_Body, Api_User_Delete_Photos_Body, Api_User_Position, Api_User_Role, Api_User_Team, Api_User_Team_Search, Api_User_Warehouse } from '../types/Api_User';
+import { Api_User, Api_User_Create, Api_User_Delete_Body, Api_User_Delete_Photos_Body, Api_User_Position, Api_User_Role, Api_User_Team, Api_User_Team_Search, Api_User_Warehouse, Api_User_Change_Password_Payload } from '../types/Api_User';
 import { ResponseApi } from '../types/Api_Service';
 declare class UserService extends ApiService {
     editUser({ id, model }: {
@@ -7,6 +7,7 @@ declare class UserService extends ApiService {
         model: any;
     }): Promise<Api_User>;
     getUser(id: string): Promise<Api_User>;
+    changeUserPassword(payload: Api_User_Change_Password_Payload): Promise<Api_User>;
     getUserWarehouses(params: {
         user_id: string;
         page?: number;

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

@@ -5,9 +5,13 @@ export declare enum ApiServiceType {
 export default class ApiService {
     private axiosInstance;
     constructor();
-    private getToken;
+    private setAccessToken;
+    private getAccessToken;
     private removeToken;
-    logout(): void;
+    private subscribeTokenRefresh;
+    private refresh;
+    private onRefreshed;
+    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/dist/types/api/types/Api_Auth.d.ts

@@ -64,6 +64,15 @@ export type Api_Auth_User = {
     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;
@@ -73,5 +82,11 @@ 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/dist/types/api/types/Api_Metrics.d.ts

@@ -21,3 +21,10 @@ export type Api_Metrics_Personnel_Plan = {
     fixed_repair: Api_Metrics_Personnel_Plan_Position[];
     ready: Api_Metrics_Personnel_Plan_User[];
 };
+export type Api_Metrics_Personnel_Plan_Project = {
+    id: string;
+    name: string;
+};
+export type Api_Metrics_Personnel_Plan_Project_Body = {
+    repairs: string[];
+};

package/dist/types/api/types/Api_User.d.ts

@@ -71,6 +71,15 @@ export type Api_User = {
         id: string;
         name: string;
     }[];
+    password_change_available_at: string;
+    password_change_due_at: string;
+    password_last_changed_at: string;
+};
+export type Api_User_Change_Password_Payload = {
+    email: string;
+    password: string;
+    currentPassword: string;
+    passwordConfirmation: string;
 };
 export type Api_User_Create = {
     last_name?: string;

package/dist/types/api/types/Api_User_Issue.d.ts

@@ -0,0 +1,37 @@
+export type Api_User_Issue_List_Item = {
+    id: string;
+    section: string;
+    status: string;
+    type: string;
+    topic: string;
+    created_at: string;
+};
+export type Api_User_Issue_Msg = {
+    id: string;
+    message: string;
+    thread_id: string;
+    user: {
+        id: string;
+        full_name: string;
+    };
+};
+export type Api_User_Issue = {
+    id: string;
+    section: string;
+    status: string;
+    type: string;
+    topic: string;
+    messages: Api_User_Issue_Msg[];
+};
+export type Api_User_Issue_Body = {
+    section: string;
+    type: string;
+    topic: string;
+    description: string;
+    files?: string[];
+};
+export type Api_User_Issue_Properties = {
+    section: Record<string, string>;
+    status: Record<string, string>;
+    type: Record<string, string>;
+};

package/package.json

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

package/src/api/services/AuthService.ts

@@ -1,6 +1,7 @@
 import ApiService from '../settings/ApiService'
 import {
   Api_Auth_Login,
+  ChangePasswordAndActivatePayload,
   ChangePasswordPayload,
   ChangePasswordResponse,
   ConfigResponse,
@@ -9,7 +10,7 @@ import {
 
 class AuthService extends ApiService {
   public login(email: string, password: string): Promise<Api_Auth_Login> {
-    return this.post<LoginPayload, Api_Auth_Login>(`/login`, {
+    return this.post<LoginPayload, Api_Auth_Login>(`/v2/login`, {
       email,
       password,
     })
@@ -26,7 +27,7 @@ class AuthService extends ApiService {
   }
 
   public logout(): Promise<Api_Auth_Login> {
-    return this.post<null, Api_Auth_Login>(`/logout`, null)
+    return this.logoutUser()
   }
 
   public userInfo() {
@@ -34,15 +35,28 @@ class AuthService extends ApiService {
   }
 
   public configs(): Promise<ConfigResponse> {
-    return this.get<ConfigResponse>(`/configs`)
+    return this.get<ConfigResponse>(`/v2/configs`)
   }
 
   public changePassword(id: string, password: string, password_confirmation: string) {
-    return this.put<ChangePasswordPayload, ChangePasswordResponse>(`/users/${id}/password`, {
+    return this.put<ChangePasswordPayload, ChangePasswordResponse>(`/v2/auth/users/${id}/password`, {
       password,
       password_confirmation,
     })
   }
+  public changePasswordAndActivate(
+    email: string,
+    currentPassword: string,
+    password: string,
+    passwordConfirmation: string,
+  ) {
+    return this.post<ChangePasswordAndActivatePayload, ChangePasswordResponse>(`/v2/auth/users/activate`, {
+      email,
+      currentPassword,
+      password,
+      passwordConfirmation,
+    })
+  }
 }
 
 let api: AuthService

package/src/api/services/MetricsService.ts

@@ -1,6 +1,11 @@
 import ApiService from '../settings/ApiService'
 import { ResponseApi } from '../types/Api_Service'
-import { Api_Metrics_Personnel_Plan, Api_Metrics_Unused_Personnel } from '@/api/types/Api_Metrics'
+import {
+  Api_Metrics_Personnel_Plan,
+  Api_Metrics_Personnel_Plan_Project,
+  Api_Metrics_Personnel_Plan_Project_Body,
+  Api_Metrics_Unused_Personnel,
+} from '@/api/types/Api_Metrics'
 
 class MetricsService extends ApiService {
   public async fetchPieProjects(queryString: string): Promise<ResponseApi<any>> {
@@ -115,7 +120,13 @@ class MetricsService extends ApiService {
   }
 
   public fetchPersonnelPlan(params: any): Promise<Api_Metrics_Personnel_Plan> {
-    return this.get(`repairs/metrics/personnel_plan`, { params })
+    return this.get('repairs/metrics/personnel_plan', { params })
+  }
+
+  public fetchPersonnelPlanProjects(
+    body: Api_Metrics_Personnel_Plan_Project_Body,
+  ): Promise<Api_Metrics_Personnel_Plan_Project[]> {
+    return this.post('repairs/metrics/projects_with_personnel_plan', body)
   }
 }
 

package/src/api/services/UserService.ts

@@ -9,7 +9,9 @@ import {
   Api_User_Team,
   Api_User_Team_Search,
   Api_User_Warehouse,
+  Api_User_Change_Password_Payload,
 } from '../types/Api_User'
+
 import { ResponseApi } from '../types/Api_Service'
 
 class UserService extends ApiService {
@@ -21,6 +23,10 @@ class UserService extends ApiService {
     return await this.get<Api_User>(`/admin/users/${id}`)
   }
 
+  public async changeUserPassword(payload: Api_User_Change_Password_Payload): Promise<Api_User> {
+    return await this.patch<Api_User_Change_Password_Payload, Api_User>(`/v2/auth/users/password`, payload)
+  }
+
   public async getUserWarehouses(params: {
     user_id: string
     page?: number

package/src/api/settings/ApiService.ts

@@ -1,4 +1,14 @@
 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',
@@ -14,14 +24,12 @@ export default class ApiService {
         'Content-Type': 'application/json',
         Accept: 'application/json',
       },
+      withCredentials: true,
     })
 
     this.axiosInstance.interceptors.request.use(
       (config: InternalAxiosRequestConfig) => {
-        const token = this.getToken()
-        if (token && config.headers) {
-          config.headers.Authorization = `Bearer ${token}`
-        }
+        config.headers.Authorization = `Bearer ${this.getAccessToken()}`
         return config
       },
       (error: AxiosError) => {
@@ -33,16 +41,53 @@ export default class ApiService {
       (response: AxiosResponse) => {
         return response.data
       },
-      (error: AxiosError) => {
-        if (error.response?.status === 401 || error.response?.status === 403) {
-          this.logout()
+      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)
         }
-        return Promise.reject(error)
       },
     )
   }
 
-  private getToken() {
+  private setAccessToken(token: string) {
+    localStorage.setItem('token', token)
+  }
+  private getAccessToken() {
     return localStorage.getItem('token')
   }
 
@@ -50,7 +95,22 @@ export default class ApiService {
     localStorage.removeItem('token')
   }
 
-  public logout(): void {
+  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'
   }

package/src/api/types/Api_Auth.ts

@@ -72,6 +72,15 @@ export type Api_Auth_User = {
   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 = {
@@ -84,6 +93,13 @@ export type ChangePasswordPayload = {
   password_confirmation: string
 }
 
+export type ChangePasswordAndActivatePayload = {
+  email: string
+  currentPassword: string
+  password: string
+  passwordConfirmation: string
+}
+
 export type ChangePasswordResponse = Pick<
   Api_User,
   | 'id'

package/src/api/types/Api_Metrics.ts

@@ -24,3 +24,12 @@ export type Api_Metrics_Personnel_Plan = {
   fixed_repair: Api_Metrics_Personnel_Plan_Position[]
   ready: Api_Metrics_Personnel_Plan_User[]
 }
+
+export type Api_Metrics_Personnel_Plan_Project = {
+  id: string
+  name: string
+}
+
+export type Api_Metrics_Personnel_Plan_Project_Body = {
+  repairs: string[]
+}

package/src/api/types/Api_User.ts

@@ -74,6 +74,16 @@ export type Api_User = {
   positions: Api_Search_User_Positions[]
   warehouses?: Partial<Api_User_Warehouse>[]
   brigades: { id: string; name: string }[]
+  password_change_available_at: string
+  password_change_due_at: string
+  password_last_changed_at: string
+}
+
+export type Api_User_Change_Password_Payload = {
+  email: string
+  password: string
+  currentPassword: string
+  passwordConfirmation: string
 }
 
 export type Api_User_Create = {