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

[Library|Trunk] 

Login guard: correct query params for redirectUrl

user compoents: fixes for the use of baselink (don't add it when already exists in the route), rename baseurl to route in components functions



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59442 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-09-21 12:50:04 +00:00
parent ead41bab9a
commit ca54df782c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
login/loginGuard.guard.ts
View File

@ -19,11 +19,11 @@ export class LoginGuard implements CanActivate, CanLoad {
return user !== null; return user !== null;
})); }));
obs.pipe(filter(isLoggedIn => !isLoggedIn)).subscribe(() => { obs.pipe(filter(isLoggedIn => !isLoggedIn)).subscribe(() => {
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_LOGIN, path}}); this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_LOGIN,'redirectUrl': path}});
}); });
return obs; return obs;
} else { } else {
this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_LOGIN, path}}); this.router.navigate(['/user-info'], {queryParams: {'errorCode': LoginErrorCodes.NOT_LOGIN, 'redirectUrl':path}});
return false; return false;
} }
} }

14
login/user.component.ts
View File

@ -77,12 +77,12 @@ export class UserComponent {
redirect() { redirect() {
if (this.redirectUrl && this.redirectUrl != "") { if (this.redirectUrl && this.redirectUrl != "") {
this.redirectUrl = decodeURIComponent(this.redirectUrl); this.redirectUrl = decodeURIComponent(this.redirectUrl);
var baseUrl = this.redirectUrl; var route = this.redirectUrl;
var queryParams = ""; var queryParams = "";
var paramsArray = []; var paramsArray = [];
var valuesArray = []; var valuesArray = [];
if (this.redirectUrl.indexOf('?') != -1) { if (this.redirectUrl.indexOf('?') != -1) {
baseUrl = this.redirectUrl.split('?')[0]; route = this.redirectUrl.split('?')[0];
queryParams = this.redirectUrl.split('?')[1]; queryParams = this.redirectUrl.split('?')[1];
} }
if (queryParams != "") { if (queryParams != "") {
@ -91,9 +91,9 @@ export class UserComponent {
paramsArray.push(queryParamsArray[i].split("=")[0]); paramsArray.push(queryParamsArray[i].split("=")[0]);
valuesArray.push(queryParamsArray[i].split("=")[1]); valuesArray.push(queryParamsArray[i].split("=")[1]);
} }
this.router.navigate([baseUrl], {queryParams: this.routerHelper.createQueryParams(paramsArray, valuesArray)}); this.router.navigate([route], {queryParams: this.routerHelper.createQueryParams(paramsArray, valuesArray)});
} else { } else {
this.router.navigate([baseUrl]); this.router.navigate([route]);
} }
} }
// else{ // else{
@ -104,18 +104,18 @@ export class UserComponent {
logIn() { logIn() {
if (this.redirectUrl && this.redirectUrl != "") { if (this.redirectUrl && this.redirectUrl != "") {
this.redirectUrl = decodeURIComponent(this.redirectUrl); this.redirectUrl = decodeURIComponent(this.redirectUrl);
var baseUrl = this.redirectUrl; var route = this.redirectUrl;
var queryParams = ""; var queryParams = "";
if (this.redirectUrl.indexOf('?') != -1) { if (this.redirectUrl.indexOf('?') != -1) {
var splits = this.redirectUrl.split('?'); var splits = this.redirectUrl.split('?');
if (splits.length > 0) { if (splits.length > 0) {
baseUrl = splits[0]; route = splits[0];
} }
if (splits.length > 1) { if (splits.length > 1) {
queryParams = splits[1]; queryParams = splits[1];
} }
} }
Session.setReloadUrl(location.protocol + "//" + location.host,properties.baseLink + baseUrl, queryParams); Session.setReloadUrl(location.protocol + "//" + location.host,properties.baseLink + route, queryParams);
} }
console.log(Session.getReloadUrl()); console.log(Session.getReloadUrl());
window.location.href = this.properties.loginUrl; window.location.href = this.properties.loginUrl;

2
login/userMini.component.ts
View File

@ -239,7 +239,7 @@ export class UserMiniComponent implements OnInit, OnChanges {
} }
logIn() { logIn() {
Session.setReloadUrl(location.protocol + "//" + location.host, properties.baseLink + this.redirectUrl, this.search); Session.setReloadUrl(location.protocol + "//" + location.host, this.redirectUrl, this.search);
window.location.href = this.logInUrl; window.location.href = this.logInUrl;
} }