feat: Add role

backend/package-lock.json

@@ -14,6 +14,7 @@
         "@nestjs/core": "^10.0.0",
         "@nestjs/jwt": "^10.2.0",
         "@nestjs/mapped-types": "*",
+        "@nestjs/passport": "^10.0.3",
         "@nestjs/platform-express": "^10.0.0",
         "@nestjs/typeorm": "^10.0.2",
         "bcrypt": "^5.1.1",
@@ -23,6 +24,9 @@
         "mysql2": "^3.11.3",
         "nest-access-control": "^3.1.0",
         "nestjs-paginate": "^9.3.0",
+        "passport": "^0.7.0",
+        "passport-jwt": "^4.0.1",
+        "passport-local": "^1.0.0",
         "pg": "^8.13.0",
         "reflect-metadata": "^0.2.0",
         "rxjs": "^7.8.1",
@@ -1820,6 +1824,16 @@
         }
       }
     },
+    "node_modules/@nestjs/passport": {
+      "version": "10.0.3",
+      "resolved": "https://registry.npmjs.org/@nestjs/passport/-/passport-10.0.3.tgz",
+      "integrity": "sha512-znJ9Y4S8ZDVY+j4doWAJ8EuuVO7SkQN3yOBmzxbGaXbvcSwFDAdGJ+OMCg52NdzIO4tQoN4pYKx8W6M0ArfFRQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0",
+        "passport": "^0.4.0 || ^0.5.0 || ^0.6.0 || ^0.7.0"
+      }
+    },
     "node_modules/@nestjs/platform-express": {
       "version": "10.4.3",
       "resolved": "https://registry.npmjs.org/@nestjs/platform-express/-/platform-express-10.4.3.tgz",
@@ -7555,6 +7569,53 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/passport": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz",
+      "integrity": "sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "passport-strategy": "1.x.x",
+        "pause": "0.0.1",
+        "utils-merge": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/jaredhanson"
+      }
+    },
+    "node_modules/passport-jwt": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.1.tgz",
+      "integrity": "sha512-UCKMDYhNuGOBE9/9Ycuoyh7vP6jpeTp/+sfMJl7nLff/t6dps+iaeE0hhNkKN8/HZHcJ7lCdOyDxHdDoxoSvdQ==",
+      "license": "MIT",
+      "dependencies": {
+        "jsonwebtoken": "^9.0.0",
+        "passport-strategy": "^1.0.0"
+      }
+    },
+    "node_modules/passport-local": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz",
+      "integrity": "sha512-9wCE6qKznvf9mQYYbgJ3sVOHmCWoUNMVFoZzNoznmISbhnNNPhN9xfY3sLmScHMetEJeoY7CXwfhCe7argfQow==",
+      "dependencies": {
+        "passport-strategy": "1.x.x"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/passport-strategy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz",
+      "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -7620,6 +7681,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/pause": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz",
+      "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="
+    },
     "node_modules/pg": {
       "version": "8.13.0",
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.13.0.tgz",

backend/package.json

@@ -30,6 +30,7 @@
     "@nestjs/core": "^10.0.0",
     "@nestjs/jwt": "^10.2.0",
     "@nestjs/mapped-types": "*",
+    "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.0.0",
     "@nestjs/typeorm": "^10.0.2",
     "bcrypt": "^5.1.1",
@@ -39,6 +40,9 @@
     "mysql2": "^3.11.3",
     "nest-access-control": "^3.1.0",
     "nestjs-paginate": "^9.3.0",
+    "passport": "^0.7.0",
+    "passport-jwt": "^4.0.1",
+    "passport-local": "^1.0.0",
     "pg": "^8.13.0",
     "reflect-metadata": "^0.2.0",
     "rxjs": "^7.8.1",

backend/src/modules/authentication/authentication.controller.ts

@@ -7,12 +7,14 @@ import {
   Post,
   Request,
 } from '@nestjs/common';
-import { AuthenticationGuard } from './authentication.guard.js';
 import { AuthenticationService } from './authentication.service.js';
 import { Public } from './authentication.decorator.js';
 import { SignInDto } from './dto/sign-in.dto.js';
 import { SignUpDto } from './dto/sign-up.dto.js';
+import { Roles } from './authorization/roles.decorator.js';
+import { Role } from './authorization/enums/role.enum.js';
 @Controller('authentication')
+
 export class AuthenticationController {
   constructor(private AuthenticationService: AuthenticationService) {}
 
@@ -30,8 +32,8 @@ export class AuthenticationController {
     return this.AuthenticationService.signUp(signUpDto);
   }
 
-  // @UseGuards(AuthenticationGuard)
   @Get('profile')
+  @Roles(Role.CUSTOMER)
   getProfile(@Request() req) {
     const userId = req.user.sub;
     return this.AuthenticationService.getProfile(userId);

backend/src/modules/authentication/authentication.module.ts

@@ -6,6 +6,7 @@ import { AuthenticationController } from './authentication.controller.js';
 import { AuthenticationGuard } from './authentication.guard.js';
 import { APP_GUARD } from '@nestjs/core';
 import { ConfigModule, ConfigService } from '@nestjs/config';
+import { RolesGuard } from './authorization/roles.guard.js';
 @Module({
   imports: [
     UserModule,
@@ -23,6 +24,10 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
     {
       provide: APP_GUARD,
       useClass: AuthenticationGuard,
+    },
+    {
+      provide: APP_GUARD,
+      useClass: RolesGuard,
     }
   ],
   controllers: [AuthenticationController],

backend/src/modules/authentication/authentication.service.ts

@@ -23,7 +23,7 @@ export class AuthenticationService {
     if (!user || (await !bcrypt.compare(pass, user.hash_password))) {
       throw new UnauthorizedException();
     }
-    const payload = { sub: user.id, username: user.id };
+    const payload = { sub: user.id, username: user.id, roles: user.role.role_name};
     return {
       access_token: await this.jwtService.signAsync(payload),
     };
@@ -49,13 +49,10 @@ export class AuthenticationService {
       email: email,
       password: hash_password
     })
-    console.log(user)
     await this.usersService.save(user);
 
-    const payload = { sub: user.id, username: user.id };
-    console.log("payload: ", payload);
+    const payload = { sub: user.id, username: user.id, role: user.role };
     const token = await this.jwtService.signAsync(payload)
-    console.log("token: ", token);
     return {
       access_token: token
     };

backend/src/modules/authentication/authorization/roles.decorator.ts

@@ -0,0 +1,5 @@
+// src/decorators/roles.decorator.ts
+import { SetMetadata } from '@nestjs/common';
+
+export const ROLES_KEY = 'roles';
+export const Roles = (...roles: string[]) => SetMetadata(ROLES_KEY, roles);

backend/src/modules/authentication/authorization/roles.guard.ts

@@ -0,0 +1,22 @@
+
+import { Injectable, CanActivate, ExecutionContext } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { Role } from 'nest-access-control';
+import { ROLES_KEY } from './roles.decorator.js';
+
+@Injectable()
+export class RolesGuard implements CanActivate {
+  constructor(private reflector: Reflector) {}
+
+  canActivate(context: ExecutionContext): boolean {
+    const requiredRoles = this.reflector.getAllAndOverride<Role[]>(ROLES_KEY, [
+      context.getHandler(),
+      context.getClass(),
+    ]);
+    if (!requiredRoles) {
+      return true;
+    }
+    const { user } = context.switchToHttp().getRequest();
+    return requiredRoles.some((role) => user.roles.includes(role));
+  }
+}

backend/src/modules/user/user.service.ts

@@ -26,6 +26,9 @@ export class UserService {
   }
 
   async findOneByField(field: string, value: any): Promise<UserEntity | undefined> {
-    return UserEntity.findOne({ where: { [field]: value } });
+    return UserEntity.findOne({ 
+      where: { [field]: value },
+      relations: ['role'] 
+    });
   }
 }