Cambios de testing 5

vacaciones/src/app/auth/admin.guard.ts

@@ -16,14 +16,25 @@ import * as sodium from 'libsodium-wrappers';
   providedIn: 'root',
 })
 export class AdminGuard implements CanActivate {
-  
-  constructor(private _iamService: IAMService, private router: Router, private _encService:ENCService) {}
+  public aux_test: any;
+
+  constructor( private router: Router, private _encService:ENCService) {}
   async canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot,
    
   ):Promise<boolean> {
+    let rfc_local = localStorage.getItem('RFCEMPRESA')!;
+    let user_local = localStorage.getItem('TIMUSERENC')!;
+    this.aux_test = setInterval(() => {
+      let jwt_local = localStorage.getItem('jwt');      
+      if (jwt_local !== null ) {
+        localStorage.setItem('RFCEMPRESA', rfc_local);
+        localStorage.setItem('TIMUSERENC', user_local);
+      }
+    }, 1000);
     
+
     let usuario:USERInterface = JSON.parse(localStorage.getItem('TIMUSERENC')!);
     
     const sleep = (ms:number) => new Promise(resolve => setTimeout(resolve, ms))

vacaciones/src/app/auth/auth.guard.ts

@@ -26,7 +26,7 @@ export class AuthGuard implements CanActivate {
   user_local: string = "";
   private empresas_arr: any[] = [];
 
-  public aux_test: any;
+  
   constructor(
     private router: Router,
     public setUserStorage: LocalstorageService
@@ -39,28 +39,7 @@ export class AuthGuard implements CanActivate {
   ) {
     
     let bloq = false;
-    let time:boolean = false;
-
-    let rfc_local = localStorage.getItem('RFCEMPRESA')!;
-    let user_local = localStorage.getItem('TIMUSERENC')!;
-    
-    /* this.user_local = this.setUserStorage.getUserStorage()!; */
-
-    
-    
-    this.aux_test = setInterval(() => {
-      let jwt_local = localStorage.getItem('jwt');      
-      if (jwt_local !== null ) {
-        localStorage.setItem('RFCEMPRESA', rfc_local);
-        localStorage.setItem('TIMUSERENC', user_local);
-      }
-    }, 1000);
-
-    /* const sleep = (ms:number) => new Promise(resolve => setTimeout(resolve, ms))
-    await sleep(10000); */
-    
     
-    time = false;
     //Se checa si existe una sesión y si no hubo cambios
     let isLoggedIn = localStorage.getItem('jwt') != null;
     if (isLoggedIn && !bloq) {

vacaciones/src/app/auth/user.guard.ts

@@ -18,7 +18,7 @@ import { Logger } from 'html2canvas/dist/types/core/logger';
 })
 export class UserGuard implements CanActivate {
   empresas_arr: any[] = [];
-
+  public aux_test: any;
   constructor(
     private router: Router,
     private _encService: ENCService
@@ -32,8 +32,16 @@ export class UserGuard implements CanActivate {
   }
 
   async canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+    let rfc_local = localStorage.getItem('RFCEMPRESA')!;
+    let user_local = localStorage.getItem('TIMUSERENC')!;
 
-    let rfc_local = localStorage.getItem('RFCEMPRESA');
+    this.aux_test = setInterval(() => {
+      let jwt_local = localStorage.getItem('jwt');      
+      if (jwt_local !== null ) {
+        localStorage.setItem('RFCEMPRESA', rfc_local);
+        localStorage.setItem('TIMUSERENC', user_local);
+      }
+    }, 1000);
     
     if (rfc_local === null || rfc_local === undefined) {
       localStorage.setItem('RFCEMPRESA', 'ITTEC');

vacaciones/src/app/components/mes/mesmre/mesmre.component.ts

@@ -109,17 +109,14 @@ export class MESMREComponent implements AfterViewInit {
     this.nombre_usuario = usuario.NOMBRE;
 
     if (
-      this._encService.desencriptar(
-        JSON.parse(localStorage.getItem('TIMUSERENC')!).PERFIL
-      ) === "1"
+      this._encService.desencriptar(JSON.parse(localStorage.getItem('TIMUSERENC')!).PERFIL) === '1'
     ) {
       this.role = 'Administrador';
     } else if (
       this._encService.desencriptar(
         JSON.parse(localStorage.getItem('TIMUSERENC')!).PERFIL
-      ) !== "1"
+      ) !== '1'
     ) {
-
       this.opcionesSolicitudes = this.opcionesSolicitudes.slice(0, 1);
       this.isUser = true;
       this.role = 'Usuario';
@@ -174,7 +171,7 @@ export class MESMREComponent implements AfterViewInit {
     if (
       this._encService.desencriptar(
         JSON.parse(localStorage.getItem('TIMUSERENC')!).PERFIL
-      ) == "1"
+      ) === '1'
     ) {
       await lastValueFrom(this.__mesmreService.consultarTodos()).then(
         (res: any) => {
@@ -201,10 +198,7 @@ export class MESMREComponent implements AfterViewInit {
 
       this.empleados = [
         ...new Map(
-          this.empleados.map((empleado) => [
-            empleado.NOMBREEMPLEADO,
-            empleado,
-          ])
+          this.empleados.map((empleado) => [empleado.NOMBREEMPLEADO, empleado])
         ).values(),
       ];
 
@@ -219,7 +213,7 @@ export class MESMREComponent implements AfterViewInit {
     } else if (
       this._encService.desencriptar(
         JSON.parse(localStorage.getItem('TIMUSERENC')!).PERFIL
-      ) == 'Usuario'
+      ) !== '1'
     ) {
       await lastValueFrom(this.__mesmreService.consultarEmpleados()).then(
         (res: any) => {
@@ -246,10 +240,7 @@ export class MESMREComponent implements AfterViewInit {
 
       this.empleados = [
         ...new Map(
-          this.empleados.map((empleado) => [
-            empleado.NOMBREEMPLEADO,
-            empleado,
-          ])
+          this.empleados.map((empleado) => [empleado.NOMBREEMPLEADO, empleado])
         ).values(),
       ];
     }
@@ -307,7 +298,7 @@ export class MESMREComponent implements AfterViewInit {
                   'Ocurrió un error inesperado, favor de intentarlo más tarde'
                 );
               } else {
-                aux_response = res.response
+                aux_response = res.response;
               }
             },
             (error) => {
@@ -325,10 +316,14 @@ export class MESMREComponent implements AfterViewInit {
             }
           );
 
-          this.obtenerPeriodos(this._encService.desencriptar( this.__mesmreService.usuario_session.IDUSUARIO));
+          this.obtenerPeriodos(
+            this._encService.desencriptar(
+              this.__mesmreService.usuario_session.IDUSUARIO
+            )
+          );
           this.cargarTabla(aux_response);
           this.filtroEstatus();
-          
+
           break;
         case 'Todos':
           await lastValueFrom(this.__mesmreService.consultarTodos()).then(
@@ -340,7 +335,8 @@ export class MESMREComponent implements AfterViewInit {
               } else {
                 aux_response = res.response;
               }
-            }, (error) => {
+            },
+            (error) => {
               if (!error.ok) {
                 this._validationService.openSnackBar(
                   'Ocurrió un error inesperado'
@@ -354,7 +350,7 @@ export class MESMREComponent implements AfterViewInit {
               }
             }
           );
-          
+
           this.cargarTabla(aux_response);
           this.filtroEstatus();
 
@@ -373,7 +369,10 @@ export class MESMREComponent implements AfterViewInit {
 
   async filtroEmpleados(empleado: MESMREInterface) {
     //Se hace un split al primer parentesis, se obtiene la segunda posicion y se elimna el segundo parentesis
-    if (empleado.NOMBREEMPLEADO.includes('(') && empleado.NOMBREEMPLEADO.includes(')')) {
+    if (
+      empleado.NOMBREEMPLEADO.includes('(') &&
+      empleado.NOMBREEMPLEADO.includes(')')
+    ) {
       let usuario = empleado.NOMBREEMPLEADO.split('(')[1].replace(')', '');
       let aux_response: any;
 
@@ -387,7 +386,7 @@ export class MESMREComponent implements AfterViewInit {
             );
           } else {
             this.tipoSolicitud = usuario;
-            aux_response = res.response
+            aux_response = res.response;
           }
         },
         (error) => {
@@ -402,11 +401,10 @@ export class MESMREComponent implements AfterViewInit {
           }
         }
       );
-      
+
       this.obtenerPeriodos(usuario);
       this.cargarTabla(aux_response);
       this.filtroEstatus();
-
     } else {
       //No cargo los datos del id
       this._validationService.openSnackBar(
@@ -690,7 +688,6 @@ export class MESMREComponent implements AfterViewInit {
     this.dataSource = new MatTableDataSource<MESMREInterface>(this.solicitudes);
     this.selection = new SelectionModel<MESMREInterface>(true, solicitudes);
 
-    
     this.dataSource.filterPredicate = function (
       data: MESMREInterface,
       filter: string
@@ -738,7 +735,7 @@ export class MESMREComponent implements AfterViewInit {
       solicitud.FECHAFIN = this.formatoFecha(solicitud.FECHAFIN);
 
       solicitud.NUMERODIAS =
-      solicitud.VACACIONESANTES - solicitud.VACACIONESDESPUES;
+        solicitud.VACACIONESANTES - solicitud.VACACIONESDESPUES;
 
       return {
         IDSOLICITUD: solicitud.IDSOLICITUD,
@@ -754,7 +751,6 @@ export class MESMREComponent implements AfterViewInit {
     });
   }
 
-
   applyFilter(filterValue: any) {
     this.dataSource.filter = filterValue.target.value.trim().toLowerCase();
   }

vacaciones/src/app/services/iam/iam.service.ts

@@ -9,6 +9,8 @@ import { WebSocketService } from '../socket/web-socket.service';
 import { ResponseData } from 'src/app/interfaces/response-data';
 import { LocalstorageService } from '../localstorage.service';
 import { AuthGuard } from 'src/app/auth/auth.guard';
+import { AdminGuard } from 'src/app/auth/admin.guard';
+import { UserGuard } from 'src/app/auth/user.guard';
 
 @Injectable({
   providedIn: 'root',
@@ -26,7 +28,8 @@ export class IAMService implements OnInit {
     private _encService: ENCService,
     private webSocketService: WebSocketService,
     public setUserStorage: LocalstorageService,
-    private test: AuthGuard
+    private adminGuard: AdminGuard,
+    private userGuard: UserGuard
   ) {
     this.getIPAddress();
   }
@@ -65,7 +68,6 @@ export class IAMService implements OnInit {
                   
                   localStorage.setItem('jwt', data!.response.TOKEN);
                   localStorage.setItem('TIMUSERENC',JSON.stringify(data?.response));
-                  this.sendService(data?.response)
                   this.userType(perfil, solicitud_datos);
 
                   break;
@@ -103,10 +105,6 @@ export class IAMService implements OnInit {
     }
   }
 
-  sendService(data:any){
-    this.setUserStorage.setUserStorage(JSON.stringify(data));
-
-  }
   private snackAlert(mensaje: string) {
     this._snackBar.open(mensaje, 'Cerrar', {
       duration: 4000,
@@ -130,8 +128,8 @@ export class IAMService implements OnInit {
   }
 
   public logout(): void {
-    
-    clearInterval(this.test.aux_test);
+    clearInterval(this.adminGuard.aux_test);
+    clearInterval(this.userGuard.aux_test);
     let rfc = localStorage.getItem('RFCEMPRESA');
     if (rfc === null || rfc === undefined || rfc === '') {
       localStorage.setItem('RFCEMPRESA', 'ITTEC');

vacaciones/src/app/services/mes/mesmre/mesmre.service.ts

@@ -53,7 +53,7 @@ export class MESMREService {
   consultarTodos(): any {
     return this.http.get<ResponseData>(
       `${this._url}/consultar/todos/${this._encService.desencriptar(
-        this.usuario_session.PERFIL
+        this.usuario_session.NOMBREPERFIL
       )}/${this._encService.desencriptar(this.usuario_session.IDUSUARIO)}/${this.formatoRFC(this.usuario_session.RFCEMPRESA)}}`,
       { headers: this.header }
     ).pipe(map(data => data));