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

Renamed retrieveAuthMethods to retrieveAuthMethodsFromAuthStatus

Browse Source
This commit is contained in:
Giuseppe Digilio
2020-01-10 15:30:26 +01:00
parent 3132da9b3d
commit 6f8f4b31bf
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,7 @@ export class AuthEffects {
.pipe( .pipe(
ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS), ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS),
switchMap((action: RetrieveAuthMethodsAction) => { switchMap((action: RetrieveAuthMethodsAction) => {
return this.authService.retrieveAuthMethods(action.payload) return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload)
.pipe( .pipe(
map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)), map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)),
catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction())) catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))

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

@@ -139,13 +139,13 @@ describe('AuthService test', () => {
it('should return the authentication methods available', () => { it('should return the authentication methods available', () => {
const authStatus = new AuthStatus(); const authStatus = new AuthStatus();
authService.retrieveAuthMethods(authStatus).subscribe((authMethods: AuthMethod[]) => { authService.retrieveAuthMethodsFromAuthStatus(authStatus).subscribe((authMethods: AuthMethod[]) => {
expect(authMethods).toBeDefined(); expect(authMethods).toBeDefined();
expect(authMethods.length).toBe(0); expect(authMethods.length).toBe(0);
}); });
authStatus.authMethods = authMethodsMock; authStatus.authMethods = authMethodsMock;
authService.retrieveAuthMethods(authStatus).subscribe((authMethods: AuthMethod[]) => { authService.retrieveAuthMethodsFromAuthStatus(authStatus).subscribe((authMethods: AuthMethod[]) => {
expect(authMethods).toBeDefined(); expect(authMethods).toBeDefined();
expect(authMethods.length).toBe(2); expect(authMethods.length).toBe(2);
}); });

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

@@ -211,7 +211,7 @@ export class AuthService {
* Retrieve authentication methods available * Retrieve authentication methods available
* @returns {User} * @returns {User}
*/ */
public retrieveAuthMethods(status: AuthStatus): Observable<AuthMethod[]> { public retrieveAuthMethodsFromAuthStatus(status: AuthStatus): Observable<AuthMethod[]> {
let authMethods: AuthMethod[] = []; let authMethods: AuthMethod[] = [];
if (isNotEmpty(status.authMethods)) { if (isNotEmpty(status.authMethods)) {
authMethods = status.authMethods; authMethods = status.authMethods;