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

70373: Store authenticated EPerson ID in store instead of object

Browse Source
This commit is contained in:
Kristof De Langhe
2020-04-15 11:14:41 +02:00
parent 638793ca5e
commit e43aa15a70
8 changed files with 72 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
View File

@@ -9,9 +9,9 @@ import { fadeInOut, fadeOut } from '../animations/fade';
import { HostWindowService } from '../host-window.service';
import { AppState, routerStateSelector } from '../../app.reducer';
import { isNotUndefined } from '../empty.util';
import { getAuthenticatedUser, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
import { isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
import { EPerson } from '../../core/eperson/models/eperson.model';
import { LOGIN_ROUTE, LOGOUT_ROUTE } from '../../core/auth/auth.service';
import { AuthService, LOGIN_ROUTE, LOGOUT_ROUTE } from '../../core/auth/auth.service';
@Component({
selector: 'ds-auth-nav-menu',
@@ -41,7 +41,8 @@ export class AuthNavMenuComponent implements OnInit {
public sub: Subscription;
constructor(private store: Store<AppState>,
private windowService: HostWindowService
private windowService: HostWindowService,
private authService: AuthService
) {
this.isXsOrSm$ = this.windowService.isXsOrSm();
}
@@ -53,7 +54,7 @@ export class AuthNavMenuComponent implements OnInit {
// set loading
this.loading = this.store.pipe(select(isAuthenticationLoading));
this.user = this.store.pipe(select(getAuthenticatedUser));
this.user = this.authService.getAuthenticatedUserFromStore();
this.showAuth = this.store.pipe(
select(routerStateSelector),