From a2fed50ea177c9a7b2b2a5651a574007988c8881 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Tue, 29 Jan 2019 13:03:31 +0000
Subject: [PATCH] Revert Guards to Can Activate

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54665 d315682c-612b-4755-9ff5-7f18f6832af3
---
 login/adminLoginGuard.guard.ts    | 10 ++++------
 login/claimsCuratorGuard.guard.ts |  9 ++++-----
 login/freeGuard.guard.ts          | 10 ++++------
 login/loginGuard.guard.ts         |  9 ++++-----
 4 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/login/adminLoginGuard.guard.ts b/login/adminLoginGuard.guard.ts
index e69c8ed8..8450c043 100644
--- a/login/adminLoginGuard.guard.ts
+++ b/login/adminLoginGuard.guard.ts
@@ -9,7 +9,7 @@ export class AdminLoginGuard implements CanActivate, CanLoad {
 
   constructor(private router: Router) {}
 
-  check(route: Route) : boolean{
+  check(path: string) : boolean{
     let loggedIn = false;
     let isAdmin = false;
     let errorCode = LoginErrorCodes.NOT_LOGIN;
@@ -21,18 +21,16 @@ export class AdminLoginGuard implements CanActivate, CanLoad {
       }
     }
     if(!loggedIn || !isAdmin) {
-      // this.guardHelper.redirect("/user-info",errorCode,state.url);
-      route.path = '/' + route.path;
-      this.router.navigate(['user-info'], {queryParams: {"errorCode": errorCode, "redirectUrl": route.path}});
+      this.router.navigate(['/user-info'], {queryParams: {"errorCode": errorCode, "redirectUrl": path}});
     }
     return loggedIn && isAdmin;
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
-    return this.check(route.routeConfig);
+    return this.check(state.url);
   }
 
   canLoad(route: Route): Observable<boolean> | Promise<boolean> | boolean {
-    return this.check(route);
+    return this.check('/' + route.path);
   }
 }
diff --git a/login/claimsCuratorGuard.guard.ts b/login/claimsCuratorGuard.guard.ts
index 8f05150b..0a7155a3 100644
--- a/login/claimsCuratorGuard.guard.ts
+++ b/login/claimsCuratorGuard.guard.ts
@@ -9,7 +9,7 @@ export class ClaimsCuratorGuard implements CanActivate, CanLoad {
 
   constructor(private router: Router) {}
 
-  check(route: Route) : boolean{
+  check(path: string)  : boolean{
     //var user;
     //var role = route.data['role']
     let loggedIn = false;
@@ -27,17 +27,16 @@ export class ClaimsCuratorGuard implements CanActivate, CanLoad {
     }
     if(!loggedIn || !isAuthorized){
       // this.guardHelper.redirect("/user-info",errorCode,state.url);
-      route.path = '/' + route.path;
-      this.router.navigate(['user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl": route.path } });
+      this.router.navigate(['/user-info'], {queryParams: {"errorCode": errorCode, "redirectUrl": path}});
     }
     return loggedIn && isAuthorized;
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
-      return this.check(route.routeConfig);
+    return this.check(state.url);
   }
 
   canLoad(route: Route): Observable<boolean> | Promise<boolean> | boolean {
-      return this.check(route);
+    return this.check('/' + route.path);
   }
 }
diff --git a/login/freeGuard.guard.ts b/login/freeGuard.guard.ts
index a7a1071d..05777984 100644
--- a/login/freeGuard.guard.ts
+++ b/login/freeGuard.guard.ts
@@ -16,23 +16,21 @@ export class FreeGuard implements CanActivate, CanLoad{
 
   constructor(private router: Router) {}
 
-  check(route: Route):boolean {
+  check(path: string) :boolean {
     //var user;
     let valid = true;
     let errorCode = LoginErrorCodes.NOT_LOGIN;
     if(!valid){
-      // this.guardHelper.redirect("/user-info",errorCode,state.url);
-      route.path = '/' + route.path;
-      this.router.navigate(['user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl":  route.path } });
+      this.router.navigate(['/user-info'], {queryParams: {"errorCode": errorCode, "redirectUrl": path}});
     }
     return valid;
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
-    return this.check(route.routeConfig);
+    return this.check(state.url);
   }
 
   canLoad(route: Route): Observable<boolean> | Promise<boolean> | boolean {
-    return this.check(route);
+    return this.check('/' + route.path);
   }
 }
diff --git a/login/loginGuard.guard.ts b/login/loginGuard.guard.ts
index 2955802e..4afd64c0 100644
--- a/login/loginGuard.guard.ts
+++ b/login/loginGuard.guard.ts
@@ -9,7 +9,7 @@ export class LoginGuard implements CanActivate, CanLoad {
 
   constructor(private router: Router) {}
 
-  check(route: Route): boolean{
+  check(path: string): boolean{
     //var user;
     let loggedIn = false;
     let errorCode = LoginErrorCodes.NOT_LOGIN;
@@ -19,17 +19,16 @@ export class LoginGuard implements CanActivate, CanLoad {
     }
     if(!loggedIn){
       // this.guardHelper.redirect("/user-info",errorCode,state.url);
-      route.path = '/' + route.path;
-      this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl":  route.path } });
+      this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, path} });
     }
     return loggedIn;
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
-    return this.check(route.routeConfig);
+    return this.check(state.url);
   }
 
   canLoad(route: Route): Observable<boolean> | Promise<boolean> | boolean {
-    return this.check(route);
+    return this.check('/' + route.path);
   }
 }