From ac0c8181e390a4a35285e2eccad4ce1f6316aa3e Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 4 Mar 2019 13:23:01 +0000 Subject: [PATCH] [Trunk|Library]: Fix CanLoad guards to get community from document(Can be used only in browser platform) git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54960 d315682c-612b-4755-9ff5-7f18f6832af3 --- connect/communityGuard/connectAdminLoginGuard.guard.ts | 2 +- connect/communityGuard/connectRIGuard.guard.ts | 2 +- connect/communityGuard/connectSubscriber.guard.ts | 2 +- connect/communityGuard/isCommunity.guard.ts | 3 ++- error/isRouteEnabled.guard.ts | 2 +- utils/piwik/previousRouteRecorder.guard.ts | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/connect/communityGuard/connectAdminLoginGuard.guard.ts b/connect/communityGuard/connectAdminLoginGuard.guard.ts index bcbc6ee0..3dca0944 100644 --- a/connect/communityGuard/connectAdminLoginGuard.guard.ts +++ b/connect/communityGuard/connectAdminLoginGuard.guard.ts @@ -50,7 +50,7 @@ export class ConnectAdminLoginGuard implements CanActivate, CanLoad { } canLoad(route: Route): Observable | Promise | boolean { - const path = '/' + route.path; + const path = '/' + route.path + document.location.search; return this.check(ConnectHelper.getCommunityFromPath(path), path); } } diff --git a/connect/communityGuard/connectRIGuard.guard.ts b/connect/communityGuard/connectRIGuard.guard.ts index 8b30a603..29c9dc85 100644 --- a/connect/communityGuard/connectRIGuard.guard.ts +++ b/connect/communityGuard/connectRIGuard.guard.ts @@ -52,7 +52,7 @@ export class ConnectRIGuard implements CanActivate, CanLoad { } canLoad(route: Route): Observable | Promise | boolean { - const path = '/' + route.path; + const path = '/' + route.path + document.location.search; return this.check(ConnectHelper.getCommunityFromPath(path), path); } } diff --git a/connect/communityGuard/connectSubscriber.guard.ts b/connect/communityGuard/connectSubscriber.guard.ts index 4ef49280..40d70738 100644 --- a/connect/communityGuard/connectSubscriber.guard.ts +++ b/connect/communityGuard/connectSubscriber.guard.ts @@ -41,7 +41,7 @@ export class ConnectSubscriberGuard implements CanActivate, CanLoad { return this.check(route.queryParams['communityId'], state.url); } canLoad(route: Route): Observable | Promise | boolean { - const path = '/' + route.path; + const path = '/' + route.path + document.location.search; return this.check(ConnectHelper.getCommunityFromPath(path), path); } diff --git a/connect/communityGuard/isCommunity.guard.ts b/connect/communityGuard/isCommunity.guard.ts index 160fd07a..a7edc364 100644 --- a/connect/communityGuard/isCommunity.guard.ts +++ b/connect/communityGuard/isCommunity.guard.ts @@ -30,7 +30,8 @@ export class IsCommunity implements CanActivate, CanLoad { } canLoad(route: Route): Observable | Promise | boolean { - const path = '/' + route.path; + const path = '/' + route.path + document.location.search; + console.log(path) return this.check(ConnectHelper.getCommunityFromPath(path)); } } diff --git a/error/isRouteEnabled.guard.ts b/error/isRouteEnabled.guard.ts index 07bf0d94..3c108a23 100644 --- a/error/isRouteEnabled.guard.ts +++ b/error/isRouteEnabled.guard.ts @@ -46,7 +46,7 @@ export class IsRouteEnabled implements CanActivate, CanLoad { return this.check(route.data, route.queryParams['communityId'], state.url); } canLoad(route: Route): Observable | Promise | boolean { - const path = '/' + route; + const path = '/' + route.path + document.location.search; return this.check(route.data, ConnectHelper.getCommunityFromPath(path), path); } } diff --git a/utils/piwik/previousRouteRecorder.guard.ts b/utils/piwik/previousRouteRecorder.guard.ts index 528b6334..26092fd9 100644 --- a/utils/piwik/previousRouteRecorder.guard.ts +++ b/utils/piwik/previousRouteRecorder.guard.ts @@ -9,7 +9,7 @@ export class PreviousRouteRecorder implements CanDeactivate { } canDeactivate(component: any): Observable | boolean { if (typeof localStorage !== 'undefined') { - //console.log("In PreviousRouteRecorder : "+this.router.url ); + // console.log("In PreviousRouteRecorder : "+this.router.url ); localStorage.setItem('previousRoute', this.router.url); } return true;