hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-16 14:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into shibboleth

Browse Source 
# Conflicts:
#	resources/i18n/de.json5
#	resources/i18n/en.json5
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2020-01-02 11:43:19 +01:00
parent eea76746b1 4b67dbf10f
commit 972f0dfd60
847 changed files with 53206 additions and 7261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/core/auth/auth.service.ts
View File

@@ -373,8 +373,7 @@ export class AuthService {
if (isNotEmpty(redirectUrl)) {
this.clearRedirectUrl();
this.router.onSameUrlNavigation = 'reload';
const url = decodeURIComponent(redirectUrl);
this.navigateToRedirectUrl(url);
this.navigateToRedirectUrl(redirectUrl);
} else {
// If redirectUrl is empty use history.
this.routeService.getHistory().pipe(
@@ -395,16 +394,17 @@ export class AuthService {
}
protected navigateToRedirectUrl(url: string) {
protected navigateToRedirectUrl(redirectUrl: string) {
const url = decodeURIComponent(redirectUrl);
// in case the user navigates directly to /login (via bookmark, etc), or the route history is not found.
if (isEmpty(url) || url.startsWith(LOGIN_ROUTE)) {
this.router.navigate(['/']);
this.router.navigateByUrl('/');
/* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
// this._window.nativeWindow.location.href = '/';
} else {
/* TODO Reenable hard redirect when REST API can handle x-forwarded-for, see https://github.com/DSpace/DSpace/pull/2207 */
// this._window.nativeWindow.location.href = url;
this.router.navigate([url]);
this.router.navigateByUrl(url);
}
}