mirror of
https://github.com/hedgedoc/hedgedoc.git
synced 2024-11-24 18:56:32 -05:00
Rename local password check method
Signed-off-by: Erik Michelson <github@erik.michelson.eu>
This commit is contained in:
parent
277e2fb1ca
commit
820a1ae43a
4 changed files with 8 additions and 8 deletions
|
@ -70,7 +70,7 @@ export class AuthController {
|
|||
@Body() changePasswordDto: UpdatePasswordDto,
|
||||
): Promise<void> {
|
||||
try {
|
||||
await this.identityService.loginWithLocalIdentity(
|
||||
await this.identityService.checkLocalPassword(
|
||||
user,
|
||||
changePasswordDto.currentPassword,
|
||||
);
|
||||
|
|
|
@ -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 () => {
|
||||
|
|
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue