[Library | Trunk]: 1. Community Service refactor. 2. Subscribe service refactor. 3. Add service on role-verification
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@60453 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
ce59d4e8bf
commit
e8774312f5
|
@ -3,7 +3,7 @@ import {HttpClient, HttpHeaders} from "@angular/common/http";
|
||||||
import {CommunityInfo} from './communityInfo';
|
import {CommunityInfo} from './communityInfo';
|
||||||
import {EnvProperties} from '../../utils/properties/env-properties';
|
import {EnvProperties} from '../../utils/properties/env-properties';
|
||||||
import {map} from "rxjs/operators";
|
import {map} from "rxjs/operators";
|
||||||
import {BehaviorSubject, from, Subscriber} from "rxjs";
|
import {BehaviorSubject, from, Observable, Subscriber} from "rxjs";
|
||||||
import {properties} from "../../../../environments/environment";
|
import {properties} from "../../../../environments/environment";
|
||||||
import {HelperFunctions} from "../../utils/HelperFunctions.class";
|
import {HelperFunctions} from "../../utils/HelperFunctions.class";
|
||||||
import {Stakeholder} from "../../monitor/entities/stakeholder";
|
import {Stakeholder} from "../../monitor/entities/stakeholder";
|
||||||
|
@ -30,30 +30,6 @@ export class CommunityService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO Remove these functions
|
|
||||||
getCommunityByService(properties: EnvProperties, url: string) {
|
|
||||||
this.promise = new Promise<any>(resolve => {
|
|
||||||
this.sub = this.getCommunity(properties, url).subscribe(res => {
|
|
||||||
this.community.next(res);
|
|
||||||
resolve();
|
|
||||||
},
|
|
||||||
error => {
|
|
||||||
this.community.error(error);
|
|
||||||
resolve();
|
|
||||||
})
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async getCommunityByStateAsync(properties: EnvProperties, url: string) {
|
|
||||||
if (!this.promise) {
|
|
||||||
this.getCommunityByService(properties, url);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.promise;
|
|
||||||
this.clearSubscriptions();
|
|
||||||
return this.community.getValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
public getCommunityAsObservable() {
|
public getCommunityAsObservable() {
|
||||||
return this.community.asObservable();
|
return this.community.asObservable();
|
||||||
}
|
}
|
||||||
|
@ -62,15 +38,6 @@ export class CommunityService {
|
||||||
this.community.next(community);
|
this.community.next(community);
|
||||||
}
|
}
|
||||||
|
|
||||||
getCommunityByState(properties: EnvProperties, url: string) {
|
|
||||||
return from(this.getCommunityByStateAsync(properties, url));
|
|
||||||
}
|
|
||||||
|
|
||||||
getCommunity(properties: EnvProperties, url: string) {
|
|
||||||
return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
|
||||||
.pipe(map(res => this.parseCommunity(res)));
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO remove NEW from function names
|
// TODO remove NEW from function names
|
||||||
getCommunityNew(communityId: string, refresh = false) {
|
getCommunityNew(communityId: string, refresh = false) {
|
||||||
if(!this.community.value || this.community.value.communityId !== communityId || refresh) {
|
if(!this.community.value || this.community.value.communityId !== communityId || refresh) {
|
||||||
|
@ -124,88 +91,6 @@ export class CommunityService {
|
||||||
/*.map(res => res.json())*/
|
/*.map(res => res.json())*/
|
||||||
}
|
}
|
||||||
|
|
||||||
async isCommunityManagerByStateAsync(properties: EnvProperties, url: string, manager: string) {
|
|
||||||
if (!this.promise) {
|
|
||||||
this.getCommunityByService(properties, url);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.promise;
|
|
||||||
let community: CommunityInfo = this.community.getValue();
|
|
||||||
return (community.managers.indexOf(manager) !== -1);
|
|
||||||
}
|
|
||||||
|
|
||||||
isCommunityManagerByState(properties: EnvProperties, url: string, manager: string) {
|
|
||||||
return from(this.isCommunityManagerByStateAsync(properties, url, manager));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
isCommunityManager(properties: EnvProperties, url: string, manager: string) {
|
|
||||||
return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
|
||||||
//.map(res => <any> res.json())
|
|
||||||
.pipe(map(res => this.parseCommunity(res)))
|
|
||||||
.pipe(map(community => community.managers.indexOf(manager) !== -1));
|
|
||||||
}
|
|
||||||
|
|
||||||
async isTypeByStateAsync(properties: EnvProperties, url: string, type: string) {
|
|
||||||
if (!this.promise) {
|
|
||||||
this.getCommunityByService(properties, url);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.promise;
|
|
||||||
let community: CommunityInfo = this.community.getValue();
|
|
||||||
return (community && community.type && community.type === type);
|
|
||||||
}
|
|
||||||
|
|
||||||
isRITypeByState(properties: EnvProperties, url: string) {
|
|
||||||
return from(this.isTypeByStateAsync(properties, url, "ri"));
|
|
||||||
}
|
|
||||||
|
|
||||||
isCommunityTypeByState(properties: EnvProperties, url: string) {
|
|
||||||
return from(this.isTypeByStateAsync(properties, url, "community"));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
isRIType(properties: EnvProperties, url: string) {
|
|
||||||
return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
|
||||||
//.map(res => <any> res.json())
|
|
||||||
.pipe(map(res => this.parseCommunity(res)))
|
|
||||||
.pipe(map(community => (community && community.type && community.type === 'ri')));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
isCommunityType(properties: EnvProperties, url: string) {
|
|
||||||
return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
|
|
||||||
//.map(res => <any> res.json())
|
|
||||||
.pipe(map(res => this.parseCommunity(res)))
|
|
||||||
.pipe(map(community => (community && community.type && community.type === 'community')));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
*/
|
|
||||||
isSubscribedToCommunity(pid: string, email: string, url: string) {
|
|
||||||
return this.http.get(url + '/' + properties.adminToolsPortalType + '/' + pid + '/subscribers')
|
|
||||||
//.map(res => ((<any>res === '') ? {} : <any> res.json()))
|
|
||||||
.pipe(map(res => {
|
|
||||||
if (res['subscribers'] && res['subscribers'] != null) {
|
|
||||||
|
|
||||||
for (let i = 0; i < res['subscribers'].length; i++) {
|
|
||||||
if (res['subscribers'][i] != null && res['subscribers'][i].email === email) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
private parseCommunity(data: any): CommunityInfo {
|
private parseCommunity(data: any): CommunityInfo {
|
||||||
|
|
||||||
const resData = Array.isArray(data) ? data[0] : data;
|
const resData = Array.isArray(data) ? data[0] : data;
|
||||||
|
@ -261,4 +146,11 @@ export class CommunityService {
|
||||||
return this.checkIsUpload(community);
|
return this.checkIsUpload(community);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isRIType(community: string): Observable<boolean> {
|
||||||
|
return this.getCommunityNew(community).pipe(map(community => community.type === 'ri'));
|
||||||
|
}
|
||||||
|
|
||||||
|
isCommunityType(community: string): Observable<boolean> {
|
||||||
|
return this.getCommunityNew(community).pipe(map(community => community.type === 'community'));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,58 +18,37 @@ import {UserManagementService} from "../../services/user-management.service";
|
||||||
import {properties} from "../../../../environments/environment";
|
import {properties} from "../../../../environments/environment";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ConnectAdminLoginGuard implements CanActivate, CanLoad {
|
export class ConnectAdminLoginGuard implements CanActivate {
|
||||||
sub: Subscription = null;
|
|
||||||
|
|
||||||
constructor(private router: Router,
|
constructor(private router: Router,
|
||||||
private communityService: CommunityService,
|
|
||||||
private propertiesService: EnvironmentSpecificService,
|
private propertiesService: EnvironmentSpecificService,
|
||||||
private userManagementService: UserManagementService) {
|
private userManagementService: UserManagementService) {
|
||||||
}
|
}
|
||||||
|
|
||||||
check(community: string, path: string): Observable<boolean> | boolean {
|
check(community: string, path: string): Observable<boolean> | boolean {
|
||||||
let errorCode = LoginErrorCodes.NOT_LOGIN;
|
let errorCode = LoginErrorCodes.NOT_LOGIN;
|
||||||
let email = null;
|
const authorized = this.userManagementService.getUserInfo(false).pipe(take(1), map(user => {
|
||||||
const authorized = this.userManagementService.getUserInfo(false).pipe(take(1),map(user => {
|
|
||||||
if (user) {
|
if (user) {
|
||||||
email = user.email;
|
|
||||||
if (Session.isPortalAdministrator(user) || Session.isCommunityCurator(user) || Session.isManager('community', community, user)) {
|
if (Session.isPortalAdministrator(user) || Session.isCommunityCurator(user) || Session.isManager('community', community, user)) {
|
||||||
return of(true);
|
return of(true);
|
||||||
} else {
|
|
||||||
errorCode = LoginErrorCodes.NOT_ADMIN;
|
|
||||||
return this.communityService.isCommunityManagerByState(properties, properties['communityAPI'] + community,
|
|
||||||
email).pipe(take(1));
|
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
return of(false);
|
return of(false);
|
||||||
}
|
}), mergeMap(authorized => {
|
||||||
}), mergeMap( authorized => {
|
|
||||||
return authorized;
|
return authorized;
|
||||||
}));
|
}));
|
||||||
//}));
|
authorized.pipe(filter(authorized => !authorized)).subscribe(() => {
|
||||||
this.sub = authorized.pipe(filter(authorized => !authorized)).subscribe(() => {
|
|
||||||
this.router.navigate(['/user-info'], {
|
this.router.navigate(['/user-info'], {
|
||||||
queryParams: {
|
queryParams: {
|
||||||
'errorCode': errorCode,
|
'errorCode': errorCode,
|
||||||
'redirectUrl': path
|
'redirectUrl': path
|
||||||
}
|
}
|
||||||
})});
|
})
|
||||||
|
});
|
||||||
return authorized;
|
return authorized;
|
||||||
}
|
}
|
||||||
|
|
||||||
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
|
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
|
||||||
return this.check(route.queryParams['communityId'], state.url);
|
return this.check(route.queryParams['communityId'], state.url);
|
||||||
}
|
}
|
||||||
|
|
||||||
canLoad(route: Route, segments: UrlSegment[]): Observable<boolean> | Promise<boolean> | boolean {
|
|
||||||
const path = StringUtils.URLSegmentsToPath(segments) + document.location.search;
|
|
||||||
return this.check(ConnectHelper.getCommunityFromPath(path), path);
|
|
||||||
}
|
|
||||||
|
|
||||||
canDeactivate() {
|
|
||||||
if(this.sub) {
|
|
||||||
this.sub.unsubscribe();
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ export class ConnectCommunityGuard implements CanActivate {
|
||||||
}
|
}
|
||||||
|
|
||||||
check(community: string): Observable<boolean> | boolean {
|
check(community: string): Observable<boolean> | boolean {
|
||||||
return this.communityService.isCommunityTypeByState(properties, properties['communityAPI'] + community).pipe(take(1), tap(isCommunity => {
|
return this.communityService.isCommunityType(community).pipe(take(1), tap(isCommunity => {
|
||||||
if (!isCommunity) {
|
if (!isCommunity) {
|
||||||
this.router.navigate(['errorcommunity']);
|
this.router.navigate(['errorcommunity']);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ export class ConnectRIGuard implements CanActivate, CanLoad {
|
||||||
}
|
}
|
||||||
|
|
||||||
check(community: string): Observable<boolean> | boolean {
|
check(community: string): Observable<boolean> | boolean {
|
||||||
return this.communityService.isRITypeByState(properties, properties['communityAPI'] + community).pipe(tap(authorized => {
|
return this.communityService.isRIType(community).pipe(tap(authorized => {
|
||||||
if (!authorized) {
|
if (!authorized) {
|
||||||
this.router.navigate(['errorcommunity']);
|
this.router.navigate(['errorcommunity']);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,18 @@
|
||||||
import {take, tap} from 'rxjs/operators';
|
import {filter, map, mergeMap, take} from 'rxjs/operators';
|
||||||
import {Injectable} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
|
import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router';
|
||||||
import {Observable} from 'rxjs';
|
import {Observable, of} from 'rxjs';
|
||||||
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
|
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
|
||||||
import {SubscribeService} from "../../utils/subscribe/subscribe.service";
|
|
||||||
import {properties} from "../../../../environments/environment";
|
import {properties} from "../../../../environments/environment";
|
||||||
import {ConnectHelper} from "../connectHelper";
|
import {ConnectHelper} from "../connectHelper";
|
||||||
|
import {Session} from "../../login/utils/helper.class";
|
||||||
|
import {UserManagementService} from "../../services/user-management.service";
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class ConnectSubscriberGuard implements CanActivate {
|
export class ConnectSubscriberGuard implements CanActivate {
|
||||||
|
|
||||||
constructor(private router: Router,
|
constructor(private router: Router,
|
||||||
private subscribeService: SubscribeService) {
|
private userManagementService: UserManagementService) {
|
||||||
}
|
}
|
||||||
|
|
||||||
check(community: string, path: string): Observable<boolean> {
|
check(community: string, path: string): Observable<boolean> {
|
||||||
|
@ -19,16 +21,25 @@ export class ConnectSubscriberGuard implements CanActivate {
|
||||||
if (communityDomain) {
|
if (communityDomain) {
|
||||||
community = communityDomain;
|
community = communityDomain;
|
||||||
}
|
}
|
||||||
return this.subscribeService.isSubscribedToCommunity(properties, community).pipe(take(1), tap(subscribed =>{
|
const authorized = this.userManagementService.getUserInfo(false).pipe(take(1), map(user => {
|
||||||
if(!subscribed){
|
if (user) {
|
||||||
|
if (Session.isSubscribedTo('community', community, user)) {
|
||||||
|
return of(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return of(false);
|
||||||
|
}), mergeMap(authorized => {
|
||||||
|
return authorized;
|
||||||
|
}));
|
||||||
|
authorized.pipe(filter(authorized => !authorized)).subscribe(() => {
|
||||||
this.router.navigate(['/user-info'], {
|
this.router.navigate(['/user-info'], {
|
||||||
queryParams: {
|
queryParams: {
|
||||||
'errorCode': errorCode,
|
'errorCode': errorCode,
|
||||||
'redirectUrl': path
|
'redirectUrl': path
|
||||||
}
|
}
|
||||||
|
})
|
||||||
});
|
});
|
||||||
}
|
return authorized;
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
|
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
|
||||||
|
|
|
@ -86,7 +86,7 @@ export class SearchDataprovidersToDepositComponent {
|
||||||
public oldTotalResults: number = 0;
|
public oldTotalResults: number = 0;
|
||||||
pagingLimit = 0;
|
pagingLimit = 0;
|
||||||
|
|
||||||
properties:EnvProperties;
|
properties:EnvProperties = properties;
|
||||||
|
|
||||||
// @ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;
|
// @ViewChild (SearchPageComponent) searchPage : SearchPageComponent ;
|
||||||
|
|
||||||
|
@ -106,9 +106,6 @@ export class SearchDataprovidersToDepositComponent {
|
||||||
}
|
}
|
||||||
|
|
||||||
public ngOnInit() {
|
public ngOnInit() {
|
||||||
|
|
||||||
|
|
||||||
this.properties = properties;
|
|
||||||
this.depositLearnHowPage = this.properties.depositLearnHowPage;
|
this.depositLearnHowPage = this.properties.depositLearnHowPage;
|
||||||
this.baseUrl = this.properties.depositSearchPage;
|
this.baseUrl = this.properties.depositSearchPage;
|
||||||
this.pagingLimit = this.properties.pagingLimit;
|
this.pagingLimit = this.properties.pagingLimit;
|
||||||
|
|
|
@ -1,67 +0,0 @@
|
||||||
import {Injectable} from '@angular/core';
|
|
||||||
import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router';
|
|
||||||
import {Observable} from 'rxjs/Observable';
|
|
||||||
import {Session} from './utils/helper.class';
|
|
||||||
import {LoginErrorCodes} from './utils/guardHelper.class';
|
|
||||||
import {catchError, filter, map, mergeMap} from "rxjs/operators";
|
|
||||||
import {UserManagementService} from "../services/user-management.service";
|
|
||||||
import {UserRegistryService} from "../services/user-registry.service";
|
|
||||||
import {of} from "rxjs";
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
import {ConnectHelper} from "../connect/connectHelper";
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class VerificationGuard implements CanActivate {
|
|
||||||
|
|
||||||
constructor(private router: Router,
|
|
||||||
private userRegistryService: UserRegistryService,
|
|
||||||
private userManagementService: UserManagementService) {
|
|
||||||
}
|
|
||||||
|
|
||||||
check(path: string, id: string, type: string, entity: string): Observable<boolean> | boolean {
|
|
||||||
if (Session.isLoggedIn()) {
|
|
||||||
return this.userManagementService.getUserInfo(false).pipe(map(user => {
|
|
||||||
if(user) {
|
|
||||||
if(id) {
|
|
||||||
return this.userRegistryService.getInvitation(id).pipe(map(invitation => {
|
|
||||||
if(invitation.type !== type || invitation.entity !== entity) {
|
|
||||||
this.router.navigate(['/error'], {queryParams: {'page': path}});
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}), catchError(error => {
|
|
||||||
if(error.status === 404) {
|
|
||||||
this.router.navigate(['/error'], {queryParams: {'page': path}});
|
|
||||||
} else {
|
|
||||||
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_AUTHORIZED, 'redirectUrl': path}});
|
|
||||||
}
|
|
||||||
return of(false);
|
|
||||||
}));
|
|
||||||
} else {
|
|
||||||
this.router.navigate(['/error'], {queryParams: {'page': path}});
|
|
||||||
return of(false);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_LOGIN, 'redirectUrl': path}});
|
|
||||||
return of(false);
|
|
||||||
}
|
|
||||||
}), mergeMap(authorized => {
|
|
||||||
return authorized;
|
|
||||||
}));
|
|
||||||
} else {
|
|
||||||
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_LOGIN,'redirectUrl': path}});
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
|
|
||||||
if(properties.dashboard === "connect" && properties.environment === 'development') {
|
|
||||||
let communityId = ConnectHelper.getCommunityFromDomain(properties.domain);
|
|
||||||
communityId = (communityId)?communityId:route.queryParams['communityId'];
|
|
||||||
return this.check(state.url, route.params.id, 'community', communityId);
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -7,13 +7,14 @@ import {LoginErrorCodes} from "../login/utils/guardHelper.class";
|
||||||
import {Subscriber} from "rxjs";
|
import {Subscriber} from "rxjs";
|
||||||
import {FormBuilder, FormControl, Validators} from "@angular/forms";
|
import {FormBuilder, FormControl, Validators} from "@angular/forms";
|
||||||
import {AlertModal} from "../utils/modal/alert";
|
import {AlertModal} from "../utils/modal/alert";
|
||||||
|
import {properties} from "../../../environments/environment";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'role-verification',
|
selector: 'role-verification',
|
||||||
template: `
|
template: `
|
||||||
<modal-alert #managerModal>
|
<modal-alert #managerModal>
|
||||||
<div>
|
<div>
|
||||||
You have been invited to join <span class="uk-text-bold">{{name}}</span> Monitor Dashboard as a manager.
|
You have been invited to join <span class="uk-text-bold">{{name}}</span> {{(service === 'monitor'?'Monitor':'Research Community')}} Dashboard as a manager.
|
||||||
<span class="portal-color">Fill</span> in the <span class="portal-color">verification code</span>, sent to your
|
<span class="portal-color">Fill</span> in the <span class="portal-color">verification code</span>, sent to your
|
||||||
email, to accept the invitation request.
|
email, to accept the invitation request.
|
||||||
</div>
|
</div>
|
||||||
|
@ -22,7 +23,7 @@ import {AlertModal} from "../utils/modal/alert";
|
||||||
<div *ngIf="error" class="uk-text-danger uk-margin-remove uk-width-1-1">{{error}}</div>
|
<div *ngIf="error" class="uk-text-danger uk-margin-remove uk-width-1-1">{{error}}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="loading" class="uk-margin-medium-top">
|
<div *ngIf="loading" class="uk-margin-medium-top uk-flex uk-flex-center">
|
||||||
<loading></loading>
|
<loading></loading>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-margin-medium-top uk-flex uk-flex-right">
|
<div class="uk-margin-medium-top uk-flex uk-flex-right">
|
||||||
|
@ -34,7 +35,7 @@ import {AlertModal} from "../utils/modal/alert";
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</modal-alert>
|
</modal-alert>
|
||||||
<modal-alert #memberModal>
|
<modal-alert *ngIf="service !== 'connect'" #memberModal>
|
||||||
<div *ngIf="!isMember">
|
<div *ngIf="!isMember">
|
||||||
<div>
|
<div>
|
||||||
You have been invited to join <span class="uk-text-bold">{{name}}</span> Monitor Dashboard as a member.
|
You have been invited to join <span class="uk-text-bold">{{name}}</span> Monitor Dashboard as a member.
|
||||||
|
@ -86,6 +87,8 @@ export class RoleVerificationComponent implements OnInit, OnDestroy {
|
||||||
public type: string;
|
public type: string;
|
||||||
@Input()
|
@Input()
|
||||||
public name: string;
|
public name: string;
|
||||||
|
@Input()
|
||||||
|
public service: "connect" | "monitor" = "monitor";
|
||||||
public user: User;
|
public user: User;
|
||||||
public verification: any;
|
public verification: any;
|
||||||
public code: FormControl;
|
public code: FormControl;
|
||||||
|
@ -116,8 +119,10 @@ export class RoleVerificationComponent implements OnInit, OnDestroy {
|
||||||
if (this.user.email === this.verification.email && this.id === this.verification.entity && this.type === this.verification.type) {
|
if (this.user.email === this.verification.email && this.id === this.verification.entity && this.type === this.verification.type) {
|
||||||
if (this.verification.verificationType === 'manager') {
|
if (this.verification.verificationType === 'manager') {
|
||||||
this.openManagerModal();
|
this.openManagerModal();
|
||||||
} else if (this.verification.verificationType === 'member') {
|
} else if (this.verification.verificationType === 'member' && this.service === "monitor") {
|
||||||
this.openMemberModal();
|
this.openMemberModal();
|
||||||
|
} else {
|
||||||
|
this.openErrorModal();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.openErrorModal();
|
this.openErrorModal();
|
||||||
|
@ -177,7 +182,11 @@ export class RoleVerificationComponent implements OnInit, OnDestroy {
|
||||||
this.managerModal.cancel();
|
this.managerModal.cancel();
|
||||||
this.error = null;
|
this.error = null;
|
||||||
this.userManagementService.updateUserInfo(() => {
|
this.userManagementService.updateUserInfo(() => {
|
||||||
|
if(this.service === "monitor") {
|
||||||
this.router.navigate(['/admin/' + this.verification.entity]);
|
this.router.navigate(['/admin/' + this.verification.entity]);
|
||||||
|
} else {
|
||||||
|
window.location.href = 'https://' + (properties.environment !== 'production'?'beta.':'') + 'admin.connect.openaire.eu/' + this.verification.entity;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}, error => {
|
}, error => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|
|
@ -18,8 +18,8 @@ export class UserRegistryService {
|
||||||
CustomOptions.registryOptions()).pipe(map((response: any) => response.response));
|
CustomOptions.registryOptions()).pipe(map((response: any) => response.response));
|
||||||
}
|
}
|
||||||
|
|
||||||
public getSubscribersCount(type: string, id: string): Observable<any> {
|
public getMembersCount(type: string, id: string): Observable<any> {
|
||||||
return this.http.get(properties.registryUrl + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/subscribers/count');
|
return this.http.get(properties.registryUrl + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '/members/count');
|
||||||
}
|
}
|
||||||
|
|
||||||
public subscribeTo(type: string, id: string): Observable<any> {
|
public subscribeTo(type: string, id: string): Observable<any> {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import {Component, Input} from "@angular/core";
|
import {Component, Input, OnInit} from "@angular/core";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'loading',
|
selector: 'loading',
|
||||||
|
@ -11,21 +11,33 @@ import {Component, Input} from "@angular/core";
|
||||||
</div>
|
</div>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
<ng-template #loading>
|
<ng-template #loading>
|
||||||
<div [class]="'uk-flex uk-flex-center '+(top_margin ? 'uk-margin-small-top' : '')">
|
<div [class]="'uk-flex uk-flex-center '+(top_margin ? 'uk-margin-small-top' : '')" [ngStyle]="style">
|
||||||
<span class="portal-color uk-icon uk-spinner">
|
<span class="uk-icon uk-spinner" [ngClass]="color">
|
||||||
<svg width="60" height="60" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg" data-svg="spinner"><circle
|
<svg width="60" height="60" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg" data-svg="spinner"><circle
|
||||||
fill="none" stroke="#000" cx="15" cy="15" r="14" style="stroke-width: 2px;"></circle></svg>
|
fill="none" stroke="#000" cx="15" cy="15" r="14" style="stroke-width: 2px;"></circle></svg>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</ng-template>`
|
</ng-template>`
|
||||||
})
|
})
|
||||||
export class LoadingComponent {
|
export class LoadingComponent implements OnInit{
|
||||||
/**
|
@Input() color: string = 'portal-color';
|
||||||
* Possible values '': blue, 'success': green, 'warning': orange and 'danger': red
|
|
||||||
*/
|
|
||||||
@Input() color: 'success' | 'warning' | 'danger' = null;
|
|
||||||
@Input() full: boolean = false;
|
@Input() full: boolean = false;
|
||||||
@Input() top_margin: boolean = true;
|
@Input() top_margin: boolean = true;
|
||||||
|
@Input() size: "small" | "medium" | "large" = "large";
|
||||||
|
public style;
|
||||||
constructor() {
|
constructor() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
let size = 1;
|
||||||
|
if(this.size === 'medium') {
|
||||||
|
size = 2;
|
||||||
|
} else if(this.size === "large") {
|
||||||
|
size = 3;
|
||||||
|
}
|
||||||
|
this.style = {
|
||||||
|
width: size*20 + 'px',
|
||||||
|
height: size*20 + 'px'
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,90 +1,24 @@
|
||||||
import {Injectable} from '@angular/core';
|
import {BehaviorSubject, Observable} from "rxjs";
|
||||||
import {HttpClient} from '@angular/common/http';
|
|
||||||
import {map, tap} from "rxjs/operators";
|
|
||||||
import {CustomOptions} from "../../services/servicesUtils/customOptions.class";
|
|
||||||
import {EnvProperties} from "../properties/env-properties";
|
|
||||||
import {BehaviorSubject, Observable, Subscriber} from "rxjs";
|
|
||||||
|
|
||||||
@Injectable()
|
|
||||||
export class SubscribeService {
|
export class SubscribeService {
|
||||||
private isSubscribedSubject: BehaviorSubject<boolean> = new BehaviorSubject(false);
|
|
||||||
|
|
||||||
constructor(private http: HttpClient) {}
|
private loading: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
|
||||||
sub;
|
private members: BehaviorSubject<number> = new BehaviorSubject<number>(0);
|
||||||
ngOnDestroy() {
|
|
||||||
this.clearSubscriptions();
|
public setLoading(loading: boolean) {
|
||||||
}
|
this.loading.next(loading);
|
||||||
clearSubscriptions(){
|
|
||||||
if (this.sub instanceof Subscriber) {
|
|
||||||
this.sub.unsubscribe();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public initIsSubscribedToCommunity(properties: EnvProperties, pid: string) {
|
|
||||||
let url = properties.adminToolsAPIURL + "/community/" + pid + "/is-subscriber/";
|
|
||||||
this.sub = this.http.get<boolean>(url, CustomOptions.getAuthOptionsWithBody()).subscribe((isSubscribed) => {
|
|
||||||
this.isSubscribedSubject.next(isSubscribed);
|
|
||||||
}, error => {
|
|
||||||
this.isSubscribedSubject.error(error);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public get isSubscribed(): Observable<boolean> {
|
public setMembers(members: number) {
|
||||||
return this.isSubscribedSubject.asObservable();
|
this.members.next(members);
|
||||||
}
|
}
|
||||||
|
|
||||||
getCommunitySubscribers(properties: EnvProperties, pid: string) {
|
public getLoading(): Observable<any> {
|
||||||
let url = properties.adminToolsAPIURL + "/" + properties.adminToolsPortalType + "/" + pid + "/subscribers";
|
return this.loading.asObservable();
|
||||||
return this.http.get<any>((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
getNumberOfCommunitySubscribers(properties: EnvProperties, pid: string) {
|
public getMembers(): Observable<any> {
|
||||||
let url = properties.adminToolsAPIURL + "/"+ properties.adminToolsPortalType +"/" + pid + "/subscribers/count";
|
return this.members.asObservable();
|
||||||
return this.http.get<any>((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
isSubscribedToCommunity(properties: EnvProperties, pid: string) {
|
|
||||||
let url = properties.adminToolsAPIURL + "/community/" + pid + "/is-subscriber/";
|
|
||||||
return this.http.get<boolean>(url, CustomOptions.getAuthOptionsWithBody())
|
|
||||||
.pipe(map(res => {
|
|
||||||
// if (res['status'] && res['status'] != 200) {
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
// if (res['subscribers'] && res['subscribers'] != null) {
|
|
||||||
//
|
|
||||||
// for (var i = 0; i < res['subscribers'].length; i++) {
|
|
||||||
// if (res['subscribers'][i] != null && res['subscribers'][i].email == email) {
|
|
||||||
// return true;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// return false;
|
|
||||||
return res;
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
subscribeToCommunity(properties: EnvProperties, pid: string) {
|
|
||||||
return this.http.post<any>(properties.adminToolsAPIURL + "/"+ properties.adminToolsPortalType +"/" + pid + "/subscriber", {}, CustomOptions.getAuthOptionsWithBody())
|
|
||||||
.pipe(tap(isSubscribed => {
|
|
||||||
this.isSubscribedSubject.next(isSubscribed);}));
|
|
||||||
}
|
|
||||||
|
|
||||||
unSubscribeToCommunity(properties: EnvProperties, pid: string) {
|
|
||||||
return this.http.post<any>(properties.adminToolsAPIURL + "/"+ properties.adminToolsPortalType+"/" + pid + "/subscriber/delete", {}, CustomOptions.getAuthOptionsWithBody())
|
|
||||||
.pipe(tap(unSubscribed => {
|
|
||||||
this.isSubscribedSubject.next(!unSubscribed);}));
|
|
||||||
}
|
|
||||||
|
|
||||||
subscribeToCommunityByEmail(properties: EnvProperties, pid: string, email: string) {
|
|
||||||
let subscriber = {"email": email};
|
|
||||||
return this.http.post<any>(properties.adminToolsAPIURL + "/"+ properties.adminToolsPortalType+"/" + pid + "/subscribers", JSON.stringify(subscriber), CustomOptions.getAuthOptionsWithBody());
|
|
||||||
}
|
|
||||||
|
|
||||||
unSubscribeToCommunityByEmail(properties: EnvProperties, pid: string, email: string) {
|
|
||||||
return this.http.post<any>(properties.adminToolsAPIURL + "/"+ properties.adminToolsPortalType+"/" + pid + "/subscribers/delete", JSON.stringify([email]), CustomOptions.getAuthOptionsWithBody());
|
|
||||||
}
|
|
||||||
|
|
||||||
getCommunitiesSubscribedTo(properties: EnvProperties/*, email: string*/) {
|
|
||||||
let url = properties.adminToolsAPIURL + "/subscriber/communities";//?email=" + email;
|
|
||||||
return this.http.get<any>(url, CustomOptions.getAuthOptionsWithBody());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue