Explorar o código

Corrección de error del botón para cerrar sesión

Jose Brito hai 7 meses
pai
achega
fb123204f5

+ 17 - 15
src/app/components/login/login.component.ts

@@ -61,25 +61,27 @@ export class LoginComponent implements OnInit {
       this._resourcesService.openSnackBar("La contraseña es un campo obligatorio.");
       return;
     }
-
     
-    let userPosition: LoginPlace = {
-      latitude: 19.3477,
-      longitude: -99.1877,
-      accuracy: 169665
-    };
-
-    this.requestLogin(userPosition);
-
-    /*this._geolocation$.pipe(take(1)).subscribe(position => {
+    let uriArr = window.location.href.split(':');
+    if(uriArr[0] == 'https'){
+      this._geolocation$.pipe(take(1)).subscribe(position => {
+        let userPosition: LoginPlace = {
+          latitude: position.coords.latitude,
+          longitude: position.coords.longitude,
+          accuracy: position.coords.accuracy
+        };
+  
+        this.requestLogin(userPosition);
+      });
+    }else{
       let userPosition: LoginPlace = {
-        latitude: position.coords.latitude,
-        longitude: position.coords.longitude,
-        accuracy: position.coords.accuracy
+        latitude: 19.3477,
+        longitude: -99.1877,
+        accuracy: 169665
       };
-
+  
       this.requestLogin(userPosition);
-    });*/
+    }
   }
   
   async requestLogin(position: LoginPlace){

+ 17 - 13
src/app/services/login-data.service.ts

@@ -25,7 +25,7 @@ export class LoginDataService {
     private _connectionsServiece: ConnectionsService,
     private _socketService: SocketService,
     private _loginService: LoginService,
-    private readonly geolocation$: GeolocationService,
+    private readonly _geolocation$: GeolocationService,
     private _resourceService: ResourcesService,
     private _geolocationService: Gservice,
   ) { 
@@ -71,13 +71,6 @@ export class LoginDataService {
       }
       this._resourceService.openSnackBar('Ocurrió un error al validar el token');
       return true;
-      /*
-      if(error.status == 500){
-        this._resourceService.openSnackBar('Ocurrió un error al validar el token');
-        return true;
-      }
-      
-      return false;*/
     }
   }
 
@@ -102,15 +95,26 @@ export class LoginDataService {
   }
 
   logout () {
-    this.geolocation$.pipe(take(1)).subscribe(position => {
+    let uriArr = window.location.href.split(':');
+    if(uriArr[0] == 'https'){
+      this._geolocation$.pipe(take(1)).subscribe(position => {
+        let userPosition: LoginPlace = {
+          latitude: position.coords.latitude,
+          longitude: position.coords.longitude,
+          accuracy: position.coords.accuracy
+        };
+  
+        this.requestLogout(userPosition);
+      });
+    }else{
       let userPosition: LoginPlace = {
-        latitude: position.coords.latitude,
-        longitude: position.coords.longitude,
-        accuracy: position.coords.accuracy
+        latitude: 19.3477,
+        longitude: -99.1877,
+        accuracy: 169665
       };
 
       this.requestLogout(userPosition);
-    });
+    }
   }
 
   async requestLogout(position: LoginPlace){