diff --git a/src/auth/guards/global.guard.ts b/src/auth/guards/global.guard.ts index dd5ebad..bbe2e97 100644 --- a/src/auth/guards/global.guard.ts +++ b/src/auth/guards/global.guard.ts @@ -14,21 +14,21 @@ export class GlobalGuard implements CanActivate { async canActivate(context: ExecutionContext): Promise { const request = context.switchToHttp().getRequest(); + const token = this.extractTokenFromHeader(request); if (!token) { throw new UnauthorizedException(); } + try { const payload = await this.jwtService.verifyAsync(token, { secret: `${process.env.SECRET}`, }); - if (payload.role !== RoleEnum.USER) { - console.log( - "🚀 ~ GlobalGuard ~ canActivate ~ request.user.role:", - request.user.role, - ); + + if (payload.role !== RoleEnum.USER && payload.role !== RoleEnum.FIELD_EXPERT) { throw new UnauthorizedException(); } + request.user = payload; request.identity = request.user; } catch {