From f39f19a14756cc829a45f912744797a25d4b9596 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Mon, 16 Apr 2018 11:50:13 +0000 Subject: [PATCH] Add subscribe Guard in linking and direct linking git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@51827 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/claims/directLinking/directLinking-routing.module.ts | 5 +++-- src/app/claims/directLinking/directLinking.module.ts | 4 +++- src/app/claims/linking/linking-routing.module.ts | 5 +++-- src/app/claims/linking/linkingGeneric.module.ts | 4 +++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/app/claims/directLinking/directLinking-routing.module.ts b/src/app/claims/directLinking/directLinking-routing.module.ts index 338f976..f938be9 100644 --- a/src/app/claims/directLinking/directLinking-routing.module.ts +++ b/src/app/claims/directLinking/directLinking-routing.module.ts @@ -5,12 +5,13 @@ import { OpenaireDirectLinkingComponent } from './directLinking.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {ConnectSubscriberGuard} from '../../openaireLibrary/connect/communityGuard/connectSubscriber.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { - redirect: '/error' + { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard, ConnectSubscriberGuard], data: { + redirect: '/error' }, canDeactivate: [PreviousRouteRecorder]}, ]) diff --git a/src/app/claims/directLinking/directLinking.module.ts b/src/app/claims/directLinking/directLinking.module.ts index 34e279d..d8936eb 100644 --- a/src/app/claims/directLinking/directLinking.module.ts +++ b/src/app/claims/directLinking/directLinking.module.ts @@ -7,12 +7,14 @@ import {DirectLinkingRoutingModule} from './directLinking-routing.module'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {ConnectSubscriberGuard} from '../../openaireLibrary/connect/communityGuard/connectSubscriber.guard'; +import {CommunityService} from '../../openaireLibrary/connect/community/community.service'; @NgModule({ imports: [ SharedModule, DirectLinkingModule, DirectLinkingRoutingModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled, ConnectSubscriberGuard, CommunityService], declarations: [ OpenaireDirectLinkingComponent ], exports:[OpenaireDirectLinkingComponent] diff --git a/src/app/claims/linking/linking-routing.module.ts b/src/app/claims/linking/linking-routing.module.ts index e853aab..d51483e 100644 --- a/src/app/claims/linking/linking-routing.module.ts +++ b/src/app/claims/linking/linking-routing.module.ts @@ -5,12 +5,13 @@ import { OpenaireLinkingComponent } from './linkingGeneric.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {ConnectSubscriberGuard} from '../../openaireLibrary/connect/communityGuard/connectSubscriber.guard'; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { - redirect: '/error' + { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard, ConnectSubscriberGuard], data: { + redirect: '/error' }, canDeactivate: [PreviousRouteRecorder]}, ]) diff --git a/src/app/claims/linking/linkingGeneric.module.ts b/src/app/claims/linking/linkingGeneric.module.ts index 95ae3ed..5095fb9 100644 --- a/src/app/claims/linking/linkingGeneric.module.ts +++ b/src/app/claims/linking/linkingGeneric.module.ts @@ -7,12 +7,14 @@ import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linki import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; +import {ConnectSubscriberGuard} from '../../openaireLibrary/connect/communityGuard/connectSubscriber.guard'; +import {CommunityService} from '../../openaireLibrary/connect/community/community.service'; @NgModule({ imports: [ SharedModule, LinkingRoutingModule, LinkingGenericModule ], - providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled], + providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled, ConnectSubscriberGuard, CommunityService], declarations: [ OpenaireLinkingComponent ], exports:[