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;