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

Fix reload location after login logout 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59457 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou 2020-09-23 10:15:39 +00:00
parent 8e50219489
commit bd41180c74
5 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect/connectHelper.ts
View File

@ -3,7 +3,7 @@ import {HttpParams} from '@angular/common/http';
export class ConnectHelper {
public static getCommunityFromDomain(domain: string): string{
// domain = "https://mes.openaire.eu"; //for testing
domain = "beta.ee.openaire.eu"; //for testing
domain = domain.indexOf("//") != -1? domain.split("//")[1]:domain; //remove https:// prefix
if (domain.indexOf('openaire.eu') === -1) {
return null;

44
login/userMini.component.ts
View File

@ -1,5 +1,5 @@
import {Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {ActivatedRoute, NavigationStart, Router} from '@angular/router';
import {Location} from '@angular/common';
import {User, Session} from './utils/helper.class';
import {RouterHelper} from '../utils/routerHelper.class';
@ -176,25 +176,27 @@ export class UserMiniComponent implements OnInit, OnChanges {
@Input() logInUrl;
@Input() logOutUrl;
@Input() cookieDomain;
@Input() fixRedirectUrl: string;
@Input() redirectUrl: string;
@Input() dark: boolean = false;
search: string = '';
sub: any;
constructor(private router: Router, private route: ActivatedRoute, private location: Location) {
constructor(private router: Router, private route: ActivatedRoute) {
this.router.events.forEach(event => {
if(event instanceof NavigationStart) {
this.initialize(event.url);
}
});
}
ngOnInit() {
if (typeof document !== 'undefined') {
this.server = false;
}
this.initialize();
this.sub = this.route.queryParams.subscribe(params => {
this.initialize();
});
}
ngOnChanges(changes: SimpleChanges): void {
@ -209,10 +211,20 @@ export class UserMiniComponent implements OnInit, OnChanges {
}
}
initialize() {
if (!this.redirectUrl && typeof location !== 'undefined') {
this.redirectUrl = location.pathname;
this.search = location.search;
initialize(url: string = null) {
if (typeof location !== 'undefined') {
if(url) {
let parts = StringUtils.split(url, ['?']);
this.redirectUrl = properties.baseLink + parts[0];
if(parts.length == 2) {
this.search = parts[1];
} else {
this.search = null;
}
} else {
this.redirectUrl = location.pathname;
this.search = location.search;
}
}
if (this.user) {
this.loggedIn = true;
@ -230,8 +242,13 @@ export class UserMiniComponent implements OnInit, OnChanges {
logOut() {
if (this.user) {
Session.removeUser();
window.location.href = this.logOutUrl + StringUtils.URIEncode(location.href);
// New method
if(properties.logoutUrl.includes('openid_logout')) {
Session.setReloadUrl(location.protocol + "//" + location.host, this.redirectUrl, this.search);
window.location.href = this.logOutUrl;
} else {
window.location.href = this.logOutUrl + StringUtils.URIEncode(location.href);
}
}
this.loggedIn = false;
this.isAuthorized = false;
@ -239,7 +256,8 @@ export class UserMiniComponent implements OnInit, OnChanges {
}
logIn() {
Session.setReloadUrl(location.protocol + "//" + location.host, this.redirectUrl, this.search);
Session.setReloadUrl(location.protocol + "//" + location.host,
this.fixRedirectUrl?(properties.baseLink + this.fixRedirectUrl):this.redirectUrl, this.search);
window.location.href = this.logInUrl;
}

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

@ -13,7 +13,7 @@ export class User {
export class Session{
public static removeUser() {
COOKIE.deleteCookie(COOKIE.cookieName_id);
COOKIE.deleteCookie("openAIRESession");
//COOKIE.deleteCookie("openAIRESession");
COOKIE.deleteCookie("openAIREUser");
}

76
reload/reload.component.ts
View File

@ -4,52 +4,52 @@ import {Session} from '../login/utils/helper.class';
import {HelperFunctions} from "../utils/HelperFunctions.class";
@Component({
selector: 'reload',
template: `
<div id="tm-main" class=" uk-section uk-margin-small-top tm-middle" >
selector: 'reload',
template: `
<div id="tm-main" class=" uk-section uk-margin-small-top tm-middle">
<div uk-grid uk-grid>
<div class="tm-main uk-width-1-1@s uk-width-1-1@m uk-width-1-1@l uk-row-first ">
<div class="tm-main uk-width-1-1@s uk-width-1-1@m uk-width-1-1@l uk-row-first ">
<div class="uk-container uk-margin-top publication">
Go to initial page....
</div>
</div>
</div>
</div>
`
`
})
export class ReloadComponent {
constructor (private route: ActivatedRoute, private _router: Router) {}
public ngOnInit() {
HelperFunctions.scroll();
var URL = Session.getReloadUrl();
if(URL && URL["path"] && URL["path"] != null && URL["path"] != ""){
var url = URL["path"];
var host = URL["host"];
var paramsObject = ((URL["params"] && URL["params"] != null)? Session.getParamsObj(URL["params"]):null);
if(host == (location.protocol+"//"+location.host)){
let baseUrl = (document && document.getElementsByTagName('base'))?document.getElementsByTagName('base')[0].href.split(document.location.host)[1]:"/";
url = (baseUrl.length>1 && url.indexOf(baseUrl)!=-1 )?("/"+url.split(baseUrl)[1]):url;
if(paramsObject && paramsObject != null){
Session.setReloadUrl("","","")
this._router.navigate([url],{ queryParams: paramsObject});
}else{
Session.setReloadUrl("","","")
this._router.navigate([url]);
}
}else{
Session.setReloadUrl("","","")
window.location.href = host+url+((URL["params"] && URL["params"] !=null)?((URL["params"].indexOf("?")==-1?"?":"")+URL["params"]):"");
}
}else{
Session.setReloadUrl("","","")
this._router.navigate(['/']);
}
constructor(private route: ActivatedRoute, private _router: Router) {
}
public ngOnInit() {
HelperFunctions.scroll();
var URL = Session.getReloadUrl();
console.log(URL);
if (URL && URL["path"] && URL["path"] != null && URL["path"] != "") {
var url = URL["path"];
var host = URL["host"];
var paramsObject = ((URL["params"] && URL["params"] != null) ? Session.getParamsObj(URL["params"]) : null);
if (host == (location.protocol + "//" + location.host)) {
let baseUrl = (document && document.getElementsByTagName('base')) ? document.getElementsByTagName('base')[0].href.split(document.location.host)[1] : "/";
url = (baseUrl.length > 1 && url.indexOf(baseUrl) != -1) ? ("/" + url.split(baseUrl)[1]) : url;
if (paramsObject) {
Session.setReloadUrl("", "", "")
this._router.navigate([url], {queryParams: paramsObject});
} else {
Session.setReloadUrl("", "", "")
this._router.navigate([url]);
}
} else {
Session.setReloadUrl("", "", "")
window.location.href = host + url + ((URL["params"] && URL["params"] != null) ? ((URL["params"].indexOf("?") == -1 ? "?" : "") + URL["params"]) : "");
}
} else {
Session.setReloadUrl("", "", "")
this._router.navigate(['/']);
}
}
}

4
sharedComponents/navigationBar.component.html
View File

@ -116,7 +116,7 @@
</ng-container>
<ng-container *ngIf="userMenu">
<user-mini [user]="user" mobileView=true
[redirectUrl]="(communityId && communityId !== 'connect')?null:properties.afterLoginRedirectLink"
[fixRedirectUrl]="(communityId && communityId !== 'connect')?null:properties.afterLoginRedirectLink"
[userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl
[logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
</ng-container>
@ -299,7 +299,7 @@
<!-- <div *ngIf="userMenu" class="uk-navbar-right"> -->
<!-- <div *ngIf="userMenu" class="uk-navbar-right"> -->
<user-mini *ngIf="userMenu" [user]="user" [dark]="dark"
[redirectUrl]="(communityId && communityId !== 'connect')?null:properties.afterLoginRedirectLink"
[fixRedirectUrl]="(communityId && communityId !== 'connect')?null:properties.afterLoginRedirectLink"
[userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl
[cookieDomain]=properties.cookieDomain></user-mini>