shared-ritm 1.3.45 → 1.3.48

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/settings/ApiService.d.ts

@@ -6,8 +6,8 @@ export default class ApiService {
     private axiosInstance;
     private isRefresh;
     constructor();
-    private setToken;
-    private getToken;
+    private setAccessToken;
+    private getAccessToken;
     private removeToken;
     private refresh;
     logoutUser(): any;

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

@@ -73,5 +73,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.3.45",
+  "version": "1.3.48",
   "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,
@@ -43,6 +44,19 @@ class AuthService extends ApiService {
       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/settings/ApiService.ts

@@ -26,9 +26,9 @@ export default class ApiService {
 
     this.axiosInstance.interceptors.request.use(
       (config: InternalAxiosRequestConfig) => {
-        const token = this.getToken()
-        if (token && config.headers) {
-          config.headers.Authorization = `Bearer ${token}`
+        const access_token = this.getAccessToken()
+        if (access_token && config.headers) {
+          config.headers.Authorization = `Bearer ${access_token}`
         }
         return config
       },
@@ -41,16 +41,25 @@ export default class ApiService {
       (response: AxiosResponse) => {
         return response.data
       },
-      async (error: AxiosError) => {
+      async error => {
+        const originalRequest = error.config
+
+        if (originalRequest?._retry) {
+          throw error
+        }
+
         if (error.response?.status === 401 || error.response?.status === 403) {
-          if (!!this.getToken() && !this.isRefresh) {
+          if (!this.getAccessToken()) return Promise.reject(error)
+          if (!this.isRefresh) {
+            originalRequest._retry = true
             this.isRefresh = true
             return this.refresh().then(response => {
               if (!response?.accessToken) {
-                return this.logoutUser()
+                this.logoutUser()
               }
               if (response?.accessToken) {
-                return this.setToken(response.accessToken)
+                this.setAccessToken(response.accessToken)
+                this.axiosInstance(originalRequest)
               }
             })
           }
@@ -61,11 +70,10 @@ export default class ApiService {
     )
   }
 
-  private setToken(token: string) {
+  private setAccessToken(token: string) {
     localStorage.setItem('token', token)
   }
-
-  private getToken() {
+  private getAccessToken() {
     return localStorage.getItem('token')
   }
 

package/src/api/types/Api_Auth.ts

@@ -84,6 +84,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'