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

[CSTPER-144] Fixed issue with authorization request encountered while logging-in with external idp

Browse Source
This commit is contained in:
Giuseppe Digilio
2020-10-06 17:09:04 +02:00
parent ddb7d5181f
commit 73a9fe16c5
8 changed files with 195 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/core/auth/auth.effects.ts
View File

@@ -145,7 +145,7 @@ export class AuthEffects {
if (response.authenticated) {
return new RetrieveTokenAction();
} else {
return new RetrieveAuthMethodsAction(response);
return this.authService.getRetrieveAuthMethodsAction(response);
}
}),
catchError((error) => observableOf(new AuthenticatedErrorAction(error)))
@@ -234,10 +234,10 @@ export class AuthEffects {
.pipe(
ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS),
switchMap((action: RetrieveAuthMethodsAction) => {
return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload)
return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload.status)
.pipe(
map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)),
catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))
map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels, action.payload.blocking)),
catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction(action.payload.blocking)))
);
})
);