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

Merge branch 'master' into w2p-54472_Create-community-and-collection-pages

Browse Source 
Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
This commit is contained in:
lotte
2018-12-20 15:59:23 +01:00
parent 7a12332d70 2055f3216d
commit 42d1bdb3d8
136 changed files with 5374 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/auth/server-auth.service.ts
View File

@@ -41,9 +41,7 @@ export class ServerAuthService extends AuthService {
// TODO this should be cleaned up, AuthStatus could be parsed by the RemoteDataService as a whole...
const person$ = this.rdbService.buildSingle<NormalizedEPerson, EPerson>(status.eperson.toString());
return person$.pipe(
map((eperson) => eperson.payload)
);
return person$.pipe(map((eperson) => eperson.payload));
} else {
throw(new Error('Not authenticated'));
}