From e31c446e1ab3168a2a1772fd5977d9bf07bc4240 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni"
 <konstantina.galouni@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Thu, 27 Jun 2019 13:28:47 +0000
Subject: [PATCH] [Trunk | Library]: error/isRouteEnabled.guard.ts: Bux fix:
 Priority to get communityId from domain (if not exists, check url parameter
 or data)

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56236 d315682c-612b-4755-9ff5-7f18f6832af3
---
 error/isRouteEnabled.guard.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/error/isRouteEnabled.guard.ts b/error/isRouteEnabled.guard.ts
index 44f272bf..86054b8c 100644
--- a/error/isRouteEnabled.guard.ts
+++ b/error/isRouteEnabled.guard.ts
@@ -28,10 +28,13 @@ export class IsRouteEnabled implements CanActivate {
 
       const redirect = customRedirect ? customRedirect : '/error';
       const obs = this.propertiesService.subscribeEnvironment().pipe(map(res => {
+        let communityDomain = null;
         if (!community) {
-          community  = ConnectHelper.getCommunityFromDomain(res.domain);
+          communityDomain  = ConnectHelper.getCommunityFromDomain(res.domain);
         }
-        if (!community && data['community']) { // for openaire or connect
+        if(communityDomain) {
+          community = communityDomain;
+        } else if (!community && data['community']) { // for openaire or connect
           community = data['community'];
         }
        return  res;