From 6f8f4b31bfbc592ec825be67736d2d73d3bde8f4 Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Fri, 10 Jan 2020 15:30:26 +0100 Subject: [PATCH] Renamed retrieveAuthMethods to retrieveAuthMethodsFromAuthStatus --- src/app/core/auth/auth.effects.ts | 2 +- src/app/core/auth/auth.service.spec.ts | 4 ++-- src/app/core/auth/auth.service.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts index b1df74cd33..9145204193 100644 --- a/src/app/core/auth/auth.effects.ts +++ b/src/app/core/auth/auth.effects.ts @@ -196,7 +196,7 @@ export class AuthEffects { .pipe( ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS), switchMap((action: RetrieveAuthMethodsAction) => { - return this.authService.retrieveAuthMethods(action.payload) + return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload) .pipe( map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)), catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction())) diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts index f138947c7a..1ead3e4f7e 100644 --- a/src/app/core/auth/auth.service.spec.ts +++ b/src/app/core/auth/auth.service.spec.ts @@ -139,13 +139,13 @@ describe('AuthService test', () => { it('should return the authentication methods available', () => { const authStatus = new AuthStatus(); - authService.retrieveAuthMethods(authStatus).subscribe((authMethods: AuthMethod[]) => { + authService.retrieveAuthMethodsFromAuthStatus(authStatus).subscribe((authMethods: AuthMethod[]) => { expect(authMethods).toBeDefined(); expect(authMethods.length).toBe(0); }); authStatus.authMethods = authMethodsMock; - authService.retrieveAuthMethods(authStatus).subscribe((authMethods: AuthMethod[]) => { + authService.retrieveAuthMethodsFromAuthStatus(authStatus).subscribe((authMethods: AuthMethod[]) => { expect(authMethods).toBeDefined(); expect(authMethods.length).toBe(2); }); diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index cb7a0bb486..7026039692 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -211,7 +211,7 @@ export class AuthService { * Retrieve authentication methods available * @returns {User} */ - public retrieveAuthMethods(status: AuthStatus): Observable { + public retrieveAuthMethodsFromAuthStatus(status: AuthStatus): Observable { let authMethods: AuthMethod[] = []; if (isNotEmpty(status.authMethods)) { authMethods = status.authMethods;