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

Merge branch 'Authentication-issue-fix' into w2p-55693_Item-mapping-to-collections

Browse Source
This commit is contained in:
Kristof De Langhe
2018-09-27 13:16:34 +02:00
parent 4731da83cd ea075fbd8f
commit 6f64b943f5
7 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/core/auth/auth-response-parsing.service.ts
View File

@@ -26,8 +26,9 @@ export class AuthResponseParsingService extends BaseResponseParsingService imple
parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === '200' || data.statusCode === 'OK')) {
const response = this.process<AuthStatus, AuthType>(data.payload, request.href);
return new AuthStatusResponse(response[Object.keys(response)[0]][0], data.statusCode);
const response: AuthStatus = this.process<AuthStatus, AuthType>(data.payload, request.href);
response.eperson = data.payload._embedded.eperson;
return new AuthStatusResponse(response, data.statusCode);
} else {
return new AuthStatusResponse(data.payload as AuthStatus, data.statusCode);
}

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

@@ -126,7 +126,7 @@ export class AuthService {
return this.authRequestService.getRequest('status', options)
.map((status: AuthStatus) => {
if (status.authenticated) {
return status.eperson[0];
return status.eperson;
} else {
throw(new Error('Not authenticated'));
}

2
src/app/core/auth/models/auth-status.model.ts
View File

@@ -13,7 +13,7 @@ export class AuthStatus {
error?: AuthError;
eperson: Eperson[];
eperson: Eperson;
token?: AuthTokenInfo;

2
src/app/core/auth/models/normalized-auth-status.model.ts
View File

@@ -21,6 +21,6 @@ export class NormalizedAuthStatus extends NormalizedDSpaceObject {
authenticated: boolean;
@autoserializeAs(Eperson)
eperson: Eperson[];
eperson: Eperson;
}

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

@@ -35,7 +35,7 @@ export class ServerAuthService extends AuthService {
return this.authRequestService.getRequest('status', options)
.map((status: AuthStatus) => {
if (status.authenticated) {
return status.eperson[0];
return status.eperson;
} else {
throw(new Error('Not authenticated'));
}

4
src/app/shared/testing/auth-request-service-stub.ts
View File

@@ -26,7 +26,7 @@ export class AuthRequestServiceStub {
if (this.validateToken(token)) {
authStatusStub.authenticated = true;
authStatusStub.token = this.mockTokenInfo;
authStatusStub.eperson = [this.mockUser];
authStatusStub.eperson = this.mockUser;
} else {
authStatusStub.authenticated = false;
}
@@ -45,7 +45,7 @@ export class AuthRequestServiceStub {
if (this.validateToken(token)) {
authStatusStub.authenticated = true;
authStatusStub.token = this.mockTokenInfo;
authStatusStub.eperson = [this.mockUser];
authStatusStub.eperson = this.mockUser;
} else {
authStatusStub.authenticated = false;
}

2
src/app/shared/testing/auth-service-stub.ts
View File

@@ -19,7 +19,7 @@ export class AuthServiceStub {
authStatus.okay = true;
authStatus.authenticated = true;
authStatus.token = this.token;
authStatus.eperson = [EpersonMock];
authStatus.eperson = EpersonMock;
return Observable.of(authStatus);
} else {
console.log('error');