[Trunk|Library]: connectCommunityGuard has been added it for check if type is community. Change community error page message

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@54965 d315682c-612b-4755-9ff5-7f18f6832af3

connect/community/community.service.ts

@@ -1,49 +1,55 @@
 import { Injectable } from '@angular/core';
 import { Http,  Headers, RequestOptions } from '@angular/http';
 import { CommunityInfo } from './communityInfo';
-import{EnvProperties} from '../../utils/properties/env-properties';
+import {EnvProperties} from '../../utils/properties/env-properties';
 
 @Injectable()
 export class CommunityService {
 
-    constructor(private http:Http) {
+    constructor(private http: Http) {
       }
 
-    getCommunity(properties:EnvProperties, url: string) {
+    getCommunity(properties: EnvProperties, url: string) {
-        return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)) : url)
+        return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
                         .map(res => <any> res.json()).map(res => this.parseCommunity(res));
     }
 
-    updateCommunity(url: string, community:any) {
+    updateCommunity(url: string, community: any) {
-        let headers = new Headers({'Content-Type': 'application/json'});
+        const headers = new Headers({'Content-Type': 'application/json'});
-        let options = new RequestOptions({headers: headers});
+        const options = new RequestOptions({headers: headers});
-
+        const body = JSON.stringify(community);
-        let body = JSON.stringify(community);
+        return this.http.post(url, body, options);
-
-
-        return this.http.post(url, body, options)
                           /*.map(res => res.json())*/
     }
 
-    iscommunityManager(properties:EnvProperties, url: string, manager:string){
+    isCommunityManager(properties: EnvProperties, url: string, manager: string) {
-      return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)) : url)
+      return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
-                      .map(res => <any> res.json()).map(res => this.parseCommunity(res)).map(community => community.managers.indexOf(manager)!=-1);
+                      .map(res => <any> res.json()).map(res =>
+              this.parseCommunity(res)).map(community => community.managers.indexOf(manager) !== -1);
     }
 
-    iscommunityRI(properties:EnvProperties, url: string){
+    isRIType(properties: EnvProperties, url: string) {
-      return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)) : url)
+      return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
-                      .map(res => <any> res.json()).map(res => this.parseCommunity(res)).map(community => (community && community.type && community.type !="community"));
+          .map(res => <any> res.json()).map(res =>
+              this.parseCommunity(res)).map(community =>
+              (community && community.type && community.type === 'ri'));
     }
 
-    isSubscribedToCommunity(pid:string, email:string, url:string){
+    isCommunityType(properties: EnvProperties, url: string) {
-      return this.http.get(url+"/community/"+pid+"/subscribers")
+        return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
-                      .map(res =>  ((<any>res =="")?{}:<any> res.json()))
+            .map(res => <any> res.json()).map(res =>
+                this.parseCommunity(res)).map(community =>
+                (community && community.type && community.type === 'community'));
+    }
 
+    isSubscribedToCommunity(pid: string, email: string, url: string) {
+      return this.http.get(url + '/community/' + pid + '/subscribers')
+                      .map(res =>  ((<any>res === '') ? {} : <any> res.json()))
                       .map(res => {
-                        if(res.subscribers && res.subscribers != null){
+                        if (res.subscribers && res.subscribers != null) {
 
-                          for(var i =0; i< res.subscribers.length; i++ ){
+                          for (let i = 0; i < res.subscribers.length; i++ ) {
-                            if(res.subscribers[i]!=null && res.subscribers[i].email == email){
+                            if (res.subscribers[i] != null && res.subscribers[i].email === email) {
                               return true;
                             }
                           }
@@ -53,11 +59,11 @@ export class CommunityService {
                       });
     }
 
-    private parseCommunity(data:any): CommunityInfo {
+    private parseCommunity(data: any): CommunityInfo {
 
-        let resData = Array.isArray(data) ? data[0] : data;
+        const resData = Array.isArray(data) ? data[0] : data;
 
-        let community: CommunityInfo = new CommunityInfo();
+        const community: CommunityInfo = new CommunityInfo();
         community['title'] = resData.name;
         community['shortTitle'] = resData.shortName;
         community['communityId'] = resData.id;
@@ -66,42 +72,42 @@ export class CommunityService {
         community['description'] = resData.description;
         community['date'] = resData.creationDate;
         community['zenodoCommunity'] = resData.zenodoCommunity;
-        community['status'] = "all";
+        community['status'] = 'all';
-        if(resData.hasOwnProperty('status')){
+        if (resData.hasOwnProperty('status')) {
           community['status'] = resData.status;
-          let status = ["all","hidden","manager"];
+          const status = ['all', 'hidden', 'manager'];
-          if(status.indexOf(community['status']) ==-1){
+          if (status.indexOf(community['status']) === -1) {
-            community['status'] = "hidden";
+            community['status'] = 'hidden';
           }
         }
         if (resData.type != null) {
               community['type'] = resData.type;
         }
 
-        if(resData.managers != null) {
+        if (resData.managers != null) {
-            if(community['managers'] == undefined) {
+            if (community['managers'] === undefined) {
               community['managers'] = new Array<string>();
             }
 
-            let managers = resData.managers;
+            const managers = resData.managers;
-            let length = Array.isArray(managers) ? managers.length : 1;
+            const length = Array.isArray(managers) ? managers.length : 1;
 
-            for(let i=0; i<length; i++) {
+            for (let i = 0; i < length; i++) {
-              let manager = Array.isArray(managers) ? managers[i] : managers;
+              const manager = Array.isArray(managers) ? managers[i] : managers;
               community.managers[i] = manager;
             }
         }
 
-        if(resData.subjects != null) {
+        if (resData.subjects != null) {
-            if(community['subjects'] == undefined) {
+            if (community['subjects'] === undefined) {
               community['subjects'] = new Array<string>();
             }
 
-            let subjects = resData.subjects;
+            const subjects = resData.subjects;
-            let length = Array.isArray(subjects) ? subjects.length : 1;
+            const length = Array.isArray(subjects) ? subjects.length : 1;
 
-            for(let i=0; i<length; i++) {
+            for (let i = 0; i < length; i++) {
-              let subject = Array.isArray(subjects) ? subjects[i] : subjects;
+              const subject = Array.isArray(subjects) ? subjects[i] : subjects;
               community.subjects[i] = subject;
             }
         }

connect/communityGuard/communityErrorPage.component.ts

@@ -1,7 +1,7 @@
-import {Component, Input}         from '@angular/core';
+import {Component, OnInit} from '@angular/core';
-import {Location}                 from '@angular/common';
+import {Location} from '@angular/common';
-import {ActivatedRoute}           from '@angular/router';
+import {ActivatedRoute} from '@angular/router';
-import {Title, Meta}              from '@angular/platform-browser';
+import {Title, Meta} from '@angular/platform-browser';
 
 @Component({
     selector: 'community-error',
@@ -12,7 +12,7 @@ import {Title, Meta}              from '@angular/platform-browser';
 
         <div class="uk-container">
             <h2>
-                There is no community selected!
+                There is no community selected or the requested page is not available at this type of community!
             </h2>
             <br>
             <p>
@@ -25,19 +25,17 @@ import {Title, Meta}              from '@angular/platform-browser';
     `
 })
 
-export class CommunityErrorPageComponent {
+export class CommunityErrorPageComponent implements OnInit {
     public page: string;
 
     constructor (private _location: Location, private _meta: Meta,
                  private _title: Title, private route: ActivatedRoute) {
 
-        var title = "OpenAIRE | Error page";
+        const title = 'OpenAIRE | Error page';
 
-        this._meta.updateTag({content:title},"property='og:title'");
+        this._meta.updateTag({content: title}, "property='og:title'");
         this._title.setTitle(title);
         this.page = _location.path(true);
-        //this.page = _router.url;
-        //this.page = location.href;
     }
 
     ngOnInit() {

connect/communityGuard/connectAdminLoginGuard.guard.ts

@@ -26,7 +26,7 @@ export class ConnectAdminLoginGuard implements CanActivate, CanLoad {
         return true;
       } else {
         const obs = this.propertiesService.subscribeEnvironment().map(res => res).mergeMap(properties => {
-          return this.communityService.iscommunityManager(properties, properties['communityAPI'] + community, Session.getUserEmail());
+          return this.communityService.isCommunityManager(properties, properties['communityAPI'] + community, Session.getUserEmail());
         });
         obs.filter(enabled => !enabled)
             .subscribe(() => this.router.navigate(['/user-info'], {

connect/communityGuard/connectCommunityGuard.guard.ts

@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core';
+import {
+  Router,
+  CanActivate,
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+  CanLoad,
+  Route
+} from '@angular/router';
+import {Observable} from 'rxjs/Observable';
+import {CommunityService} from '../community/community.service';
+import { EnvironmentSpecificService} from '../../utils/properties/environment-specific.service';
+import {ConnectHelper} from '../connectHelper';
+
+@Injectable()
+export class ConnectCommunityGuard implements  CanActivate, CanLoad {
+
+  constructor(private router: Router,
+              private communityService: CommunityService,
+              private propertiesService: EnvironmentSpecificService) {
+  }
+
+  check(community: string): Observable<boolean> | boolean {
+    const obs = this.propertiesService.subscribeEnvironment().mergeMap(properties => {
+      return this.communityService.isCommunityType(properties, properties['communityAPI'] + community);
+    });
+    obs.filter(enabled => !enabled)
+        .subscribe(() => this.router.navigate(['errorcommunity']));
+    return obs;
+  }
+
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
+    return this.check(route.queryParams['communityId']);
+  }
+
+  canLoad(route: Route): Observable<boolean> | Promise<boolean> | boolean {
+    const path = '/' + route.path + document.location.search;
+    return this.check(ConnectHelper.getCommunityFromPath(path));
+  }
+}

connect/communityGuard/connectRIGuard.guard.ts

@@ -8,8 +8,6 @@ import {
   Route
 } from '@angular/router';
 import {Observable} from 'rxjs/Observable';
-import {Session} from '../../login/utils/helper.class';
-import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
 import {CommunityService} from '../community/community.service';
 import { EnvironmentSpecificService} from '../../utils/properties/environment-specific.service';
 import {ConnectHelper} from '../connectHelper';
@@ -22,37 +20,21 @@ export class ConnectRIGuard implements  CanActivate, CanLoad {
               private propertiesService: EnvironmentSpecificService) {
   }
 
-  check(community: string, path: string): Observable<boolean> | boolean {
+  check(community: string): Observable<boolean> | boolean {
-    let errorCode = LoginErrorCodes.NOT_LOGIN;
+    const obs = this.propertiesService.subscribeEnvironment().mergeMap(properties => {
-    if (Session.isLoggedIn()) {
+      return this.communityService.isRIType(properties, properties['communityAPI'] + community);
-      if (Session.isPortalAdministrator()) {
+    });
-        return true;
+    obs.filter(enabled => !enabled)
-      } else {
+        .subscribe(() => this.router.navigate(['errorcommunity']));
-        const obs = this.propertiesService.subscribeEnvironment().mergeMap(properties => {
+    return obs;
-          return this.communityService.iscommunityRI(properties, properties['communityAPI'] + community);
-        });
-        obs.filter(enabled => !enabled)
-            .subscribe(() => this.router.navigate(['/user-info'], {
-              queryParams: {
-                'errorCode': errorCode,
-                'redirectUrl': path
-              }
-            }));
-        return obs;
-      }
-    } else {
-      errorCode = LoginErrorCodes.NOT_LOGIN;
-      this.router.navigate(['/user-info'], {queryParams: {'errorCode': errorCode, 'redirectUrl': path}});
-      return false;
-    }
   }
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
-    return this.check(route.queryParams['communityId'], state.url);
+    return this.check(route.queryParams['communityId']);
   }
 
   canLoad(route: Route): Observable<boolean> | Promise<boolean> | boolean {
     const path = '/' + route.path + document.location.search;
-    return this.check(ConnectHelper.getCommunityFromPath(path), path);
+    return this.check(ConnectHelper.getCommunityFromPath(path));
   }
 }

connect/communityGuard/isCommunity.guard.ts

@@ -31,7 +31,6 @@ export class IsCommunity implements CanActivate, CanLoad {
 
   canLoad(route: Route): Observable<boolean> | Promise<boolean> | boolean {
     const path = '/' + route.path + document.location.search;
-    console.log(path)
     return this.check(ConnectHelper.getCommunityFromPath(path));
   }
 }

connect/connectHelper.ts

@@ -15,7 +15,7 @@ export class ConnectHelper {
     } else {
       domain = domain.substr(0, domain.indexOf('.'));
     }
-    if(domain == "connect" || domain == "explore" || domain == "monitor"){
+    if (domain === 'connect' || domain === 'explore' || domain === 'monitor'){
       return null;
     }
     return domain;

error/isRouteEnabled.guard.ts

@@ -27,15 +27,15 @@ export class IsRouteEnabled implements CanActivate, CanLoad {
     }
       const redirect = customRedirect ? customRedirect : '/error';
       const obs = this.propertiesService.subscribeEnvironment().map(res => {
-        if(!community){
+        if (!community) {
           community  = ConnectHelper.getCommunityFromDomain(res.domain);
         }
-       return  res["adminToolsAPIURL"]
+       return  res['adminToolsAPIURL'];
       }).mergeMap(url => {
-        if(!community){ // no community to check - return true
+        if (!community) { // no community to check - return true
           return Observable.of(true);
         }
-        return this.config.isPageEnabled(url, community,"/"+path.split("?")[0].substring(1))
+        return this.config.isPageEnabled(url, community, '/' + path.split('?')[0].substring(1));
       });
       obs.filter(enabled => !enabled)
           .subscribe(() => this.router.navigate([redirect], {queryParams: {'page': path}}));

login/utils/guardHelper.class.ts

@@ -1,21 +1,9 @@
-
-import { Router} from '@angular/router';
-
-// export class GuardHelper{
-//   constructor(private router: Router) {}
-//
-//   redirect(url:string, errorCode:number, redirectUrl:string){
-//       this.router.navigate([url], { queryParams: { "errorCode": errorCode, "redirectUrl":  redirectUrl } });
-//
-//   }
-//
-// }
 export class LoginErrorCodes {
-   public static NOT_LOGIN:number =1;
+   public static NOT_LOGIN = 1;
-   public static NOT_ADMIN:number =2;
+   public static NOT_ADMIN = 2;
-   public static NOT_VALID:number =3;
+   public static NOT_VALID = 3;
-   public static NOT_CONNECT_ADMIN:number =4;
+   public static NOT_CONNECT_ADMIN = 4;
-   public static NO_COMMUNITY:number =5;
+   public static NO_COMMUNITY = 5;
-   public static NOT_SUBSCRIBER:number =6;
+   public static NOT_SUBSCRIBER = 6;
 
 }