ammar/backend
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/backend.git synced 2025-11-26 18:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: return proper error on login API (#386)

Browse Source
This commit is contained in:
ZaydSkaff
2025-06-03 09:47:24 +03:00
committed by GitHub
parent 12a9272b8b
commit 35ce13a67f
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,18 @@
import { PlatformType } from '@app/common/constants/platform-type.enum';
import { RoleType } from '@app/common/constants/role.type.enum';
import { import {
BadRequestException, BadRequestException,
Injectable, Injectable,
UnauthorizedException, UnauthorizedException,
} from '@nestjs/common'; } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { JwtService } from '@nestjs/jwt'; import { JwtService } from '@nestjs/jwt';
import * as argon2 from 'argon2'; import * as argon2 from 'argon2';
import { HelperHashService } from '../../helper/services';
import { UserRepository } from '../../../../common/src/modules/user/repositories';
import { UserSessionRepository } from '../../../../common/src/modules/session/repositories/session.repository';
import { UserSessionEntity } from '../../../../common/src/modules/session/entities';
import { ConfigService } from '@nestjs/config';
import { OAuth2Client } from 'google-auth-library'; import { OAuth2Client } from 'google-auth-library';
import { PlatformType } from '@app/common/constants/platform-type.enum'; import { UserSessionEntity } from '../../../../common/src/modules/session/entities';
import { RoleType } from '@app/common/constants/role.type.enum'; import { UserSessionRepository } from '../../../../common/src/modules/session/repositories/session.repository';
import { UserRepository } from '../../../../common/src/modules/user/repositories';
import { HelperHashService } from '../../helper/services';
@Injectable() @Injectable()
export class AuthService { export class AuthService {
@ -40,16 +40,17 @@ export class AuthService {
}, },
relations: ['roleType', 'project'], relations: ['roleType', 'project'],
}); });
if (
platform === PlatformType.WEB &&
(user.roleType.type === RoleType.SPACE_OWNER ||
user.roleType.type === RoleType.SPACE_MEMBER)
) {
throw new UnauthorizedException('Access denied for web platform');
}
if (!user) { if (!user) {
throw new BadRequestException('Invalid credentials'); throw new BadRequestException('Invalid credentials');
} }
if (
platform === PlatformType.WEB &&
[RoleType.SPACE_OWNER, RoleType.SPACE_MEMBER].includes(
user.roleType.type as RoleType,
)
) {
throw new UnauthorizedException('Access denied for web platform');
}
if (!user.isUserVerified) { if (!user.isUserVerified) {
throw new BadRequestException('User is not verified'); throw new BadRequestException('User is not verified');

1
libs/common/src/modules/role-type/entities/role.type.entity.ts
View File

@ -12,6 +12,7 @@ export class RoleTypeEntity extends AbstractEntity<RoleTypeDto> {
nullable: false, nullable: false,
enum: Object.values(RoleType), enum: Object.values(RoleType),
}) })
// why is this ts-type string not enum?
type: string; type: string;
@OneToMany(() => UserEntity, (inviteUser) => inviteUser.roleType, { @OneToMany(() => UserEntity, (inviteUser) => inviteUser.roleType, {
nullable: true, nullable: true,