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

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

Browse Source 
# Conflicts:
#	src/app/core/auth/auth.interceptor.ts
#	src/app/shared/auth-nav-menu/auth-nav-menu.component.html
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2020-01-17 12:11:46 +01:00
parent 1e99071907 1ca1fe746a
commit 29b2e89625
196 changed files with 7841 additions and 1985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,8 @@ export class AuthService {
// and is not the login route, clear redirect url and messages
const routeUrl$ = this.store.pipe(
select(routerStateSelector),
filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state)),
filter((routerState: RouterReducerState) => isNotUndefined(routerState)
&& isNotUndefined(routerState.state) && isNotEmpty(routerState.state.url)),
filter((routerState: RouterReducerState) => !this.isLoginRoute(routerState.state.url)),
map((routerState: RouterReducerState) => routerState.state.url)
);