MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename 'ErrorCodes' class to 'LoginErrorCodes' of login/utils/guardHelper.class.ts 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@53612 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2018-11-01 17:20:05 +00:00
parent 0b67a62e64
commit 9f688a2946
10 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
claims/claim-utils/claimContextSearchForm.component.ts
View File

@ -6,7 +6,7 @@ import {ClaimContext} from './claimEntities.class';
import { StaticAutoCompleteComponent } from '../../utils/staticAutoComplete/staticAutoComplete.component';
declare var UIkit:any;
import {Session} from '../../login/utils/helper.class';
import {ErrorCodes} from '../../login/utils/guardHelper.class';
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
import{EnvProperties} from '../../utils/properties/env-properties';
@Component({
@ -494,6 +494,6 @@ saveStateAndRedirectLogin(){
localStorage.setItem(this.localStoragePrefix + "inlineEntity", JSON.stringify(this.inlineEntity));
}
this.router.navigate(['/user-info'], { queryParams: { "errorCode": ErrorCodes.NOT_VALID, "redirectUrl": this.router.url } });
this.router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this.router.url } });
}
}

4
claims/linking/insertClaim/insertClaim.component.ts
View File

@ -7,7 +7,7 @@ import {ModalLoading} from '../../../utils/modal/loading.component';
import {AlertModal} from '../../../utils/modal/alert';
import {Md5} from 'ts-md5/dist/md5';
import {Session} from '../../../login/utils/helper.class';
import {ErrorCodes} from '../../../login/utils/guardHelper.class';
import {LoginErrorCodes} from '../../../login/utils/guardHelper.class';
import{EnvProperties} from '../../../utils/properties/env-properties';
@Component({
@ -91,7 +91,7 @@ private insertActions(){
localStorage.setItem(this.localStoragePrefix + "inlineEntity", JSON.stringify(this.inlineEntity));
}
this._router.navigate(['/user-info'], { queryParams: { "errorCode": ErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
this._router.navigate(['/user-info'], { queryParams: { "errorCode": LoginErrorCodes.NOT_VALID, "redirectUrl": this._router.url} });
}else{
this.claiming = true;

8
connect/communityGuard/connectAdminLoginGuard.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Session} from '../../login/utils/helper.class';
import {ErrorCodes} from '../../login/utils/guardHelper.class';
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
import {CommunityService} from '../community/community.service';
import { EnvironmentSpecificService} from '../../utils/properties/environment-specific.service';
import { mergeMap } from 'rxjs/operators';
@ -16,14 +16,14 @@ export class ConnectAdminLoginGuard implements CanActivate {
var user;
var loggedIn = false;
var isAdmin = false;
var errorCode = ErrorCodes.NOT_LOGGIN;
var errorCode = LoginErrorCodes.NOT_LOGGIN;
let community = (route.queryParams["communityId"]);
if(Session.isLoggedIn()){
loggedIn = true;
if(!Session.isLoggedIn()){
loggedIn = false;
errorCode = ErrorCodes.NOT_VALID;
errorCode = LoginErrorCodes.NOT_VALID;
this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl": state.url } });
return false;
@ -39,7 +39,7 @@ export class ConnectAdminLoginGuard implements CanActivate {
return obs;
}
}else{
errorCode =ErrorCodes.NOT_LOGGIN;
errorCode =LoginErrorCodes.NOT_LOGGIN;
this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl": state.url } });
return false;

8
connect/communityGuard/connectRIGuard.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Session} from '../../login/utils/helper.class';
import {ErrorCodes} from '../../login/utils/guardHelper.class';
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
import {CommunityService} from '../community/community.service';
import { EnvironmentSpecificService} from '../../utils/properties/environment-specific.service';
import { mergeMap } from 'rxjs/operators';
@ -16,14 +16,14 @@ export class ConnectRIGuard implements CanActivate {
var user;
var loggedIn = false;
var isAdmin = false;
var errorCode = ErrorCodes.NOT_LOGGIN;
var errorCode = LoginErrorCodes.NOT_LOGGIN;
let community = (route.queryParams["communityId"]);
if(Session.isLoggedIn()){
loggedIn = true;
if(!Session.isLoggedIn()){
loggedIn = false;
errorCode = ErrorCodes.NOT_VALID;
errorCode = LoginErrorCodes.NOT_VALID;
this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl": state.url } });
return false;
@ -39,7 +39,7 @@ export class ConnectRIGuard implements CanActivate {
return obs;
}
}else{
errorCode =ErrorCodes.NOT_LOGGIN;
errorCode =LoginErrorCodes.NOT_LOGGIN;
this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl": state.url } });
return false;

6
connect/communityGuard/connectSubscriber.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Session} from '../../login/utils/helper.class';
import {ErrorCodes} from '../../login/utils/guardHelper.class';
import {LoginErrorCodes} from '../../login/utils/guardHelper.class';
import {CommunityService} from '../community/community.service';
import { EnvironmentSpecificService} from '../../utils/properties/environment-specific.service';
import { mergeMap } from 'rxjs/operators';
@ -16,14 +16,14 @@ export class ConnectSubscriberGuard implements CanActivate {
console.log(state.url);
var user;
var authorized = false;
var errorCode = ErrorCodes.NOT_SUBSCIBER;
var errorCode = LoginErrorCodes.NOT_SUBSCIBER;
let community = (route.queryParams["communityId"]);
if(!community){
community = ConnectHelper.getCommunityFromDomain(document.location.hostname);
}
if(!Session.isLoggedIn()){
errorCode = ErrorCodes.NOT_LOGGIN;
errorCode = LoginErrorCodes.NOT_LOGGIN;
this.router.navigate(['/user-info'], { queryParams: { "errorCode": errorCode, "redirectUrl": state.url } });
return false;
}

10
login/adminLoginGuard.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Session} from './utils/helper.class';
import {ErrorCodes} from './utils/guardHelper.class';
import {LoginErrorCodes} from './utils/guardHelper.class';
@Injectable()
export class AdminLoginGuard implements CanActivate {
@ -13,20 +13,20 @@ export class AdminLoginGuard implements CanActivate {
var user;
var loggedIn = false;
var isAdmin = false;
var errorCode = ErrorCodes.NOT_LOGGIN;
var errorCode = LoginErrorCodes.NOT_LOGGIN;
if(Session.isLoggedIn()){
loggedIn = true;
if(!Session.isLoggedIn()){
loggedIn = false;
errorCode = ErrorCodes.NOT_VALID;
errorCode = LoginErrorCodes.NOT_VALID;
}else {
isAdmin = Session.isPortalAdministrator();
if(!isAdmin){
errorCode = ErrorCodes.NOT_ADMIN;
errorCode = LoginErrorCodes.NOT_ADMIN;
}
}
}else{
errorCode =ErrorCodes.NOT_LOGGIN;
errorCode =LoginErrorCodes.NOT_LOGGIN;
}
if(!loggedIn){

10
login/claimsCuratorGuard.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Session} from './utils/helper.class';
import {ErrorCodes} from './utils/guardHelper.class';
import {LoginErrorCodes} from './utils/guardHelper.class';
@Injectable()
export class ClaimsCuratorGuard implements CanActivate {
@ -14,23 +14,23 @@ export class ClaimsCuratorGuard implements CanActivate {
var role = route.data['role']
var loggedIn = false;
var isAuthorized = false;
var errorCode = ErrorCodes.NOT_LOGGIN;
var errorCode = LoginErrorCodes.NOT_LOGGIN;
if(Session.isLoggedIn()){
loggedIn = true;
if(!Session.isLoggedIn()){
loggedIn = false;
errorCode = ErrorCodes.NOT_VALID;
errorCode = LoginErrorCodes.NOT_VALID;
}else {
if(Session.isClaimsCurator() || Session.isPortalAdministrator()){
isAuthorized =true;
}
if(!Session.isClaimsCurator() && !Session.isPortalAdministrator()){
errorCode = ErrorCodes.NOT_ADMIN;
errorCode = LoginErrorCodes.NOT_ADMIN;
}
}
}else{
errorCode =ErrorCodes.NOT_LOGGIN;
errorCode =LoginErrorCodes.NOT_LOGGIN;
}
if(!loggedIn){

6
login/freeGuard.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, ActivatedRoute} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Session} from './utils/helper.class';
import {ErrorCodes} from './utils/guardHelper.class';
import {LoginErrorCodes} from './utils/guardHelper.class';
@Injectable()
export class FreeGuard implements CanActivate {
@ -13,14 +13,14 @@ export class FreeGuard implements CanActivate {
var user;
var valid = true;
var loggedIn = false;
var errorCode = ErrorCodes.NOT_LOGGIN;
var errorCode = LoginErrorCodes.NOT_LOGGIN;
if(Session.isLoggedIn()){
loggedIn = true;
if(!Session.isLoggedIn()){
loggedIn = false;
valid = false;
errorCode = ErrorCodes.NOT_VALID;
errorCode = LoginErrorCodes.NOT_VALID;
}
}

8
login/loginGuard.guard.ts
View File

@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
import { Router,CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs/Observable';
import {Session} from './utils/helper.class';
import {ErrorCodes} from './utils/guardHelper.class';
import {LoginErrorCodes} from './utils/guardHelper.class';
@Injectable()
export class LoginGuard implements CanActivate {
@ -12,16 +12,16 @@ export class LoginGuard implements CanActivate {
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> | boolean {
var user;
var loggedIn = false;
var errorCode = ErrorCodes.NOT_LOGGIN;
var errorCode = LoginErrorCodes.NOT_LOGGIN;
if(Session.isLoggedIn()){
loggedIn = true;
if(!Session.isLoggedIn()){
loggedIn = false;
errorCode = ErrorCodes.NOT_VALID;
errorCode = LoginErrorCodes.NOT_VALID;
}
}else{
errorCode = ErrorCodes.NOT_LOGGIN;
errorCode = LoginErrorCodes.NOT_LOGGIN;
}
if(!loggedIn){
// this.guardHelper.redirect("/user-info",errorCode,state.url);

2
login/utils/guardHelper.class.ts
View File

@ -10,7 +10,7 @@ import { Router} from '@angular/router';
// }
//
// }
export class ErrorCodes {
export class LoginErrorCodes {
public static NOT_LOGGIN:number =1;
public static NOT_ADMIN:number =2;
public static NOT_VALID:number =3;