ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-07-15 02:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor and enhance user authentication in AuthService

Browse Source
This commit is contained in:
faris Aljohari
2025-01-08 00:14:21 -06:00
parent 38b6cd1a62
commit a8ac2ecae3
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libs/common/src/auth/services/auth.service.ts
View File

@ -33,32 +33,33 @@ export class AuthService {
const user = await this.userRepository.findOne({ const user = await this.userRepository.findOne({
where: { where: {
email, email,
region: regionUuid region: regionUuid ? { uuid: regionUuid } : undefined,
? {
uuid: regionUuid,
}
: undefined,
}, },
relations: ['roleType'], relations: ['roleType'],
}); });
if (!user) {
throw new BadRequestException('Invalid credentials');
}
if (!user.isUserVerified) { if (!user.isUserVerified) {
throw new BadRequestException('User is not verified'); throw new BadRequestException('User is not verified');
} }
if (!user.isActive) { if (!user.isActive) {
throw new BadRequestException('User is not active'); throw new BadRequestException('User is not active');
} }
if (user) {
const passwordMatch = this.helperHashService.bcryptCompare( const passwordMatch = await this.helperHashService.bcryptCompare(
pass, pass,
user.password, user.password,
); );
if (passwordMatch) { if (!passwordMatch) {
const { ...result } = user; throw new BadRequestException('Invalid credentials');
return result;
}
} }
return null;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { password, ...result } = user;
return result;
} }
async createSession(data): Promise<UserSessionEntity> { async createSession(data): Promise<UserSessionEntity> {