Rename local password check method

Signed-off-by: Erik Michelson <github@erik.michelson.eu>
This commit is contained in:
Erik Michelson 2022-01-03 23:41:34 +01:00 committed by David Mehren
parent 277e2fb1ca
commit 820a1ae43a
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
4 changed files with 8 additions and 8 deletions

View file

@ -70,7 +70,7 @@ export class AuthController {
@Body() changePasswordDto: UpdatePasswordDto,
): Promise<void> {
try {
await this.identityService.loginWithLocalIdentity(
await this.identityService.checkLocalPassword(
user,
changePasswordDto.currentPassword,
);

View file

@ -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 () => {

View file

@ -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<void> {
async checkLocalPassword(user: User, password: string): Promise<void> {
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();
}

View file

@ -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) {