Ryan/docmost
1
0
Fork 0
mirror of https://github.com/docmost/docmost.git synced 2025-11-18 15:41:15 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feat/sharing

Browse Source
This commit is contained in:
Philipinho
2025-04-09 20:22:44 +01:00
parent 18e8c4cbaf 29bb52db0c
commit b5c90ec775
10 changed files with 76 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/server/package.json
View File

@ -1,6 +1,6 @@
{
"name": "server",
"version": "0.9.0",
"version": "0.10.0",
"description": "",
"author": "",
"private": true,

11
apps/server/src/core/auth/services/auth.service.ts
View File

@ -47,13 +47,18 @@ export class AuthService {
includePassword: true,
});
const errorMessage = 'email or password does not match';
if (!user || user?.deletedAt) {
throw new UnauthorizedException(errorMessage);
}
const isPasswordMatch = await comparePasswordHash(
loginDto.password,
user?.password,
user.password,
);
if (!user || !isPasswordMatch || user.deletedAt) {
throw new UnauthorizedException('email or password does not match');
if (!isPasswordMatch) {
throw new UnauthorizedException(errorMessage);
}
user.lastLoginAt = new Date();