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

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

Browse Source 
# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/core/auth/auth.service.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2020-03-23 10:36:19 +01:00
parent b2234e45e9 103605c36e
commit 7cf0480098
152 changed files with 5929 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ import { NativeWindowRef, NativeWindowService } from '../services/window.service
import { Base64EncodeUrl } from '../../shared/utils/encode-decode.util';
import { RouteService } from '../services/route.service';
import { EPersonDataService } from '../eperson/eperson-data.service';
import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
import { getAllSucceededRemoteDataPayload } from '../shared/operators';
import { AuthMethod } from './models/auth.method';
export const LOGIN_ROUTE = '/login';
@@ -168,7 +168,7 @@ export class AuthService {
*/
public retrieveAuthenticatedUserByHref(userHref: string): Observable<EPerson> {
return this.epersonService.findByHref(userHref).pipe(
getFirstSucceededRemoteDataPayload()
getAllSucceededRemoteDataPayload()
)
}