From 820a1ae43aab250298bec1ef490cf91c20026ffa Mon Sep 17 00:00:00 2001 From: Erik Michelson Date: Mon, 3 Jan 2022 23:41:34 +0100 Subject: [PATCH] Rename local password check method Signed-off-by: Erik Michelson --- src/api/private/auth/auth.controller.ts | 2 +- src/identity/identity.service.spec.ts | 6 +++--- src/identity/identity.service.ts | 6 +++--- src/identity/local/local.strategy.ts | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/api/private/auth/auth.controller.ts b/src/api/private/auth/auth.controller.ts index b003b70ce..d95f6cbe9 100644 --- a/src/api/private/auth/auth.controller.ts +++ b/src/api/private/auth/auth.controller.ts @@ -70,7 +70,7 @@ export class AuthController { @Body() changePasswordDto: UpdatePasswordDto, ): Promise { try { - await this.identityService.loginWithLocalIdentity( + await this.identityService.checkLocalPassword( user, changePasswordDto.currentPassword, ); diff --git a/src/identity/identity.service.spec.ts b/src/identity/identity.service.spec.ts index c93b4b797..91b3d3d96 100644 --- a/src/identity/identity.service.spec.ts +++ b/src/identity/identity.service.spec.ts @@ -102,9 +102,9 @@ describe('IdentityService', () => { ) as Identity; identity.passwordHash = await hashPassword(password); user.identities = Promise.resolve([identity]); - await expect( - service.loginWithLocalIdentity(user, password), - ).resolves.toEqual(undefined); + await expect(service.checkLocalPassword(user, password)).resolves.toEqual( + undefined, + ); }); describe('fails', () => { it('when user has no local identity', async () => { diff --git a/src/identity/identity.service.ts b/src/identity/identity.service.ts index 22e573b27..fa624c986 100644 --- a/src/identity/identity.service.ts +++ b/src/identity/identity.service.ts @@ -73,20 +73,20 @@ export class IdentityService { * @param {string} password - the password to use * @throws {NotInDBError} the specified user can't be logged in */ - async loginWithLocalIdentity(user: User, password: string): Promise { + async checkLocalPassword(user: User, password: string): Promise { const internalIdentity: Identity | undefined = await getFirstIdentityFromUser(user, ProviderType.LOCAL); if (internalIdentity === undefined) { this.logger.debug( `The user with the username ${user.username} does not have a internal identity.`, - 'loginWithLocalIdentity', + 'checkLocalPassword', ); throw new NotInDBError(); } if (!(await checkPassword(password, internalIdentity.passwordHash ?? ''))) { this.logger.debug( `Password check for ${user.username} did not succeed.`, - 'loginWithLocalIdentity', + 'checkLocalPassword', ); throw new NotInDBError(); } diff --git a/src/identity/local/local.strategy.ts b/src/identity/local/local.strategy.ts index 3f927577b..3952c9f90 100644 --- a/src/identity/local/local.strategy.ts +++ b/src/identity/local/local.strategy.ts @@ -30,7 +30,7 @@ export class LocalStrategy extends PassportStrategy(Strategy, 'local') { const user = await this.userService.getUserByUsername(username, [ UserRelationEnum.IDENTITIES, ]); - await this.identityService.loginWithLocalIdentity(user, password); + await this.identityService.checkLocalPassword(user, password); return user; } catch (e) { if (e instanceof NotInDBError) {