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

[Library]: Add http error codes on errorPage and loginUser. 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57438 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2019-10-22 10:06:44 +00:00
parent f1a9f98600
commit bee36bfc13
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
error/errorPage.component.ts
View File

@ -1,7 +1,8 @@
import {Component, Input} from '@angular/core'; import {Component, Inject, Input, Optional} 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';
import {RESPONSE} from "@nguniversal/express-engine/tokens";
@Component({ @Component({
selector: 'error', selector: 'error',
@ -33,7 +34,8 @@ export class ErrorPageComponent {
public page: string; public page: string;
constructor (private _location: Location, private _meta: Meta, constructor (private _location: Location, private _meta: Meta,
private _title: Title, private route: ActivatedRoute) { private _title: Title, private route: ActivatedRoute,
@Optional() @Inject(RESPONSE) private response: any) {
var title = "OpenAIRE | Error page"; var title = "OpenAIRE | Error page";
@ -44,6 +46,8 @@ export class ErrorPageComponent {
//this.page = location.href; //this.page = location.href;
} }
ngOnInit() { ngOnInit() {
this.response.statusCode = 404;
this.response.statusMessage = '404 - Page not found';
this.route.queryParams.subscribe(data => { this.route.queryParams.subscribe(data => {
this.page = data['page']; this.page = data['page'];
if (!this.page) { if (!this.page) {

21
login/user.component.ts
View File

@ -1,12 +1,13 @@
import {Component, Input} from '@angular/core'; import {Component, Inject, Input, Optional} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {Title, Meta} from '@angular/platform-browser'; import {Meta, Title} from '@angular/platform-browser';
import {User, Session} from './utils/helper.class'; import {Session, User} from './utils/helper.class';
import {RouterHelper} from '../utils/routerHelper.class'; import {RouterHelper} from '../utils/routerHelper.class';
import {EnvProperties} from '../utils/properties/env-properties'; import {EnvProperties} from '../utils/properties/env-properties';
import {UserManagementService} from "../services/user-management.service"; import {UserManagementService} from "../services/user-management.service";
import {RESPONSE} from "@nguniversal/express-engine/tokens";
@Component({ @Component({
selector: 'user', selector: 'user',
@ -32,7 +33,8 @@ export class UserComponent {
private route: ActivatedRoute, private route: ActivatedRoute,
private _meta: Meta, private _meta: Meta,
private _title: Title, private _title: Title,
private userManagementsService: UserManagementService) { private userManagementsService: UserManagementService,
@Optional() @Inject(RESPONSE) private response: any) {
var title = "OpenAIRE | Login"; var title = "OpenAIRE | Login";
this._title.setTitle(title); this._title.setTitle(title);
@ -58,6 +60,17 @@ export class UserComponent {
this.errorMessage = ""; this.errorMessage = "";
if (this.loggedIn && this.errorCode == '1') { if (this.loggedIn && this.errorCode == '1') {
this.redirect(); this.redirect();
} else {
if (this.errorCode == '1') {
this.response.statusCode = 403;
this.response.statusMessage = '403 - Forbidden';
} else if (this.errorCode == '2' || this.errorCode == '3' || this.errorCode == '5') {
this.response.statusCode = 401;
this.response.statusMessage = '401 - Unauthorized';
} else {
this.response.statusCode = 400;
this.response.statusMessage = '400 - Bad Request';
}
} }
}); });
}); });