Merge branch 'EDATOS-3338' into 'develop'

EDATOS-3338 - Autenticación en área personal

See merge request istac/edatos-external-users!62

Author: Francisco Arturo Cruz Zelante

edatos-external-users-external-js/webapp/src/app/app-routing.module.ts

@@ -3,6 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
 import { USER, ALL_ALLOWED, FILTER_ROLES } from './core/service';
 import { UserRouteAccessGuard } from './core/guard';
 import { DEFAULT_PATH } from './app.constants';
+import { NotLoggedUserCanAccessGuard } from './core/guard/not-logged-user-can-access.guard';
 
 const APP_ROUTES: Routes = [
     {

edatos-external-users-external-js/webapp/src/app/app.constants.ts

@@ -16,7 +16,7 @@ export const ERROR_ALERT_KEY = 'alert-errors';
 export const LANG_KEY = 'lang';
 export const DEFAULT_LANG = 'es';
 
-export const DEFAULT_PATH = '/login';
+export const DEFAULT_PATH = '/filter';
 
 export const ITEMS_PER_PAGE = 20;
 export const PAGINATION_OPTIONS = [5, 10, 15, 20];

edatos-external-users-external-js/webapp/src/app/core/core.module.ts

@@ -20,6 +20,7 @@ import { UserRouteAccessGuard } from './guard';
 import localeEs from '@angular/common/locales/es';
 import { registerLocaleData } from '@angular/common';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { NotLoggedUserCanAccessGuard } from './guard/not-logged-user-can-access.guard';
 
 registerLocaleData(localeEs, 'es');
 @NgModule({
@@ -33,6 +34,7 @@ registerLocaleData(localeEs, 'es');
         StateStorageService,
         AccountUserService,
         UserRouteAccessGuard,
+        NotLoggedUserCanAccessGuard,
         PageTitleService,
         Title,
         {

edatos-external-users-external-js/webapp/src/app/core/guard/not-logged-user-can-access.guard.ts

@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, Data, CanLoad, Route } from '@angular/router';
+import { DEFAULT_PATH } from '@app/app.constants';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { Principal } from '../service/auth/principal.service';
+
+@Injectable()
+export class NotLoggedUserCanAccessGuard implements CanLoad, CanActivate {
+    constructor(private router: Router, private principal: Principal) {}
+
+    canActivate(route: ActivatedRouteSnapshot): Promise<boolean> {
+        return this.canNavigateIsNotAuthenticated();
+    }
+
+    canLoad(route: Route): Promise<boolean> {
+        return this.canNavigateIsNotAuthenticated();
+    }
+
+    private checkIsAuthenticated(): Promise<boolean> {
+        return this.principal.identity().then((account) => {
+            return !!account;
+        });
+    }
+
+    private canNavigateIsNotAuthenticated(): Promise<boolean> {
+        return this.checkIsAuthenticated().then((authenticated) => {
+            if (authenticated) {
+                this.router.navigate([DEFAULT_PATH]);
+                return false;
+            }
+            return true;
+        });
+    }
+}

edatos-external-users-external-js/webapp/src/app/core/service/auth/login.service.ts

@@ -2,15 +2,20 @@ import { Injectable } from '@angular/core';
 
 import { Principal } from './principal.service';
 import { AuthServerProvider } from './auth-jwt.service';
-import { ConfigService } from '@app/config/config.service';
+import { Observable } from 'rxjs';
+import { Router } from '@angular/router';
 
 @Injectable()
 export class LoginService {
-    constructor(private principal: Principal, private authServerProvider: AuthServerProvider, private configService: ConfigService) {}
+    constructor(private router: Router, private principal: Principal, private authServerProvider: AuthServerProvider) {}
 
     logout() {
-        this.authServerProvider.logout().subscribe();
-        this.principal.authenticate(null);
+        return this.authServerProvider
+            .logout()
+            .toPromise()
+            .then(() => {
+                this.principal.authenticate(null);
+                this.router.navigate(['login']);
+            });
     }
-
 }

edatos-external-users-external-js/webapp/src/app/layouts/navbar/navbar.component.ts

@@ -45,7 +45,6 @@ export class NavbarComponent implements OnInit {
     logout() {
         this.collapseNavbar();
         this.loginService.logout();
-        const config = this.configService.getConfig();
     }
 
     toggleNavbar() {

edatos-external-users-external-js/webapp/src/app/modules/login/login-routing.module.ts

@@ -2,15 +2,16 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { LoginComponent } from './login.component';
 import { ALL_ALLOWED } from '@app/core/service/auth';
+import { NotLoggedUserCanAccessGuard } from '@app/core/guard/not-logged-user-can-access.guard';
 
 export const loginRoutes: Routes = [
     {
         path: '',
         component: LoginComponent,
         data: {
-            roles: ALL_ALLOWED,
             pageTitle: 'login.home.title',
         },
+        canActivate: [NotLoggedUserCanAccessGuard],
     },
 ];