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

add client relation btw user and client

Browse Source
This commit is contained in:
faris Aljohari
2025-03-27 01:55:26 +03:00
parent cbd3f5028b
commit cf8cf08bdc
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/auth/controllers/user-auth.controller.ts
View File

@ -37,8 +37,12 @@ export class UserAuthController {
summary: ControllerRoute.AUTHENTICATION.ACTIONS.SIGN_UP_SUMMARY,
description: ControllerRoute.AUTHENTICATION.ACTIONS.SIGN_UP_DESCRIPTION,
})
async signUp(@Body() userSignUpDto: UserSignUpDto) {
const signupUser = await this.userAuthService.signUp(userSignUpDto);
async signUp(@Body() userSignUpDto: UserSignUpDto, @Req() req: any) {
const clientUuid = req.client.uuid;
const signupUser = await this.userAuthService.signUp(
userSignUpDto,
clientUuid,
);
return {
statusCode: HttpStatus.CREATED,
data: {

6
src/auth/services/user-auth.service.ts
View File

@ -34,7 +34,10 @@ export class UserAuthService {
private readonly configService: ConfigService,
) {}
async signUp(userSignUpDto: UserSignUpDto): Promise<UserEntity> {
async signUp(
userSignUpDto: UserSignUpDto,
clientUuid?: string,
): Promise<UserEntity> {
const findUser = await this.findUser(userSignUpDto.email);
if (findUser) {
@ -63,6 +66,7 @@ export class UserAuthService {
hasAcceptedAppAgreement,
password: hashedPassword,
roleType: { uuid: spaceMemberRole.uuid },
client: { uuid: clientUuid },
region: regionUuid
? {
uuid: regionUuid,

12
src/guards/client.guard.ts
View File

@ -20,6 +20,8 @@ export class ClientGuard extends AuthGuard('jwt') {
if (!this.validateToken(decoded)) {
throw new UnauthorizedException('Invalid token');
}
request.client = (decoded as jwt.JwtPayload).client;
} catch (err) {
throw new UnauthorizedException('Invalid token');
}
@ -36,14 +38,6 @@ export class ClientGuard extends AuthGuard('jwt') {
}
private validateToken(decoded: any): boolean {
if (
decoded &&
decoded.client &&
decoded.client.clientId &&
decoded.client.uuid
) {
return true;
}
return false;
return decoded?.client?.clientId && decoded?.client?.uuid;
}
}