Merge pull request #15 from PBL6-team-CATS/fix/config-env

backend/.gitignore

@@ -54,3 +54,4 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+src/modules/authentication/constants.ts

backend/package-lock.json

@@ -3993,6 +3993,7 @@
       "version": "16.4.5",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
       "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       },

backend/src/entities/user.entity.ts

@@ -10,12 +10,14 @@ import {
 } from 'typeorm';
 import { BranchEntity } from './branch.entity.js';
 import { RoleEntity } from './role.entity.js';
+import { IsOptional } from 'class-validator';
 
 @Entity('users')
 export class UserEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id: string;
 
+  @IsOptional()
   @Column({ nullable: true })
   avatar: string;
 
@@ -31,21 +33,26 @@ export class UserEntity extends BaseEntity {
   @Column({ nullable: true })
   email: string;
 
+  @IsOptional()
   @Column({ nullable: true })
   role_id: number;
-
+  
   @Column({ nullable: true })
   hash_password: string;
 
+  @IsOptional()
   @Column({ default: true })
   is_valid: boolean;
 
+  @IsOptional()
   @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
   create_at: Date;
 
+  @IsOptional()
   @OneToMany(() => BranchEntity, (branch) => branch.owner)
   branches: Relation<BranchEntity>[];
 
+  @IsOptional()
   @ManyToOne(() => RoleEntity)
   @JoinColumn({ name: 'role_id'})
   role: RoleEntity;

backend/src/modules/authentication/README.md

@@ -0,0 +1,33 @@
+# Set up
+Hiện tại cái **JWT_KEY** trong file **.env** vì lý do gì đó mà lúc đọc vào thì có lúc undefine, lúc ok nên t để cái JWT_KEY trong file constants.ts (ni t ignore cái file nớ rou)
+* Vào src/modules/authentication tạo file **constants.ts** với nội dung sau:
+```javascript
+export const jwtConstants = {
+    secret: '',
+  };
+```
+Trong đó **secret** là một cái JWT key t sẽ cung cấp sau. 
+
+## Signup
+**Url:** *http://localhost:3000/authentication/signup* <br>
+**Method:** POST <br>
+**Input:**
+* full_name: Tên của người dùng
+* Email: Tài khoản email, hiện đang để optional do chưa xử lý cái unique
+* Số điện thoại: Số điện thoại đang để check mã vùng ở Việt Nam
+* password: Độ dài ít nhất 8 ký tự <br>
+**Output:** 
+* access_token
+
+## Login
+**Url:** *http://localhost:3000/authentication/login* <br>
+**Method:** POST <br>
+**Input:**
+* username: hiện đang để là full_name, sau ni sẽ sửa lại database với code để email và số điện thoại là unique
+* password: Độ dài ít nhất 8 ký tự
+**Output:** <br>
+* access_token
+
+
+
+

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

@@ -11,7 +11,7 @@ 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';
 @Controller('authentication')
 export class AuthenticationController {
   constructor(private AuthenticationService: AuthenticationService) {}
@@ -23,6 +23,13 @@ export class AuthenticationController {
     return this.AuthenticationService.signIn(signInDto.username, signInDto.password);
   }
 
+  @Public()
+  @HttpCode(HttpStatus.OK)
+  @Post('signup')
+  signUp(@Body() signUpDto: SignUpDto) {
+    return this.AuthenticationService.signUp(signUpDto);
+  }
+
   // @UseGuards(AuthenticationGuard)
   @Get('profile')
   getProfile(@Request() req) {

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

@@ -5,15 +5,17 @@ import {
   UnauthorizedException,
 } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { jwtConstants } from './constants.js';
 import { Request } from 'express';
 import { Reflector } from '@nestjs/core';
 import { IS_PUBLIC_KEY } from './authentication.decorator.js';
+import { ConfigService } from '@nestjs/config';
+import { buffer } from 'stream/consumers';
 @Injectable()
 export class AuthenticationGuard implements CanActivate {
   constructor(
     private jwtService: JwtService,
     private reflector: Reflector,
+    private configService: ConfigService
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
@@ -33,7 +35,7 @@ export class AuthenticationGuard implements CanActivate {
     }
     try {
       const payload = await this.jwtService.verifyAsync(token, {
-        secret: jwtConstants.secret,
+        secret: this.configService.get<String>('JWT_KEY') as string,
       });
       // 💡 We're assigning the payload to the request object here
       // so that we can access it in our route handlers

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

@@ -3,16 +3,19 @@ import { AuthenticationService } from './authentication.service.js';
 import { UserModule } from '../user/user.module.js';
 import { JwtModule } from '@nestjs/jwt';
 import { AuthenticationController } from './authentication.controller.js';
-import { jwtConstants } from './constants.js';
 import { AuthenticationGuard } from './authentication.guard.js';
 import { APP_GUARD } from '@nestjs/core';
+import { ConfigModule, ConfigService } from '@nestjs/config';
 @Module({
   imports: [
     UserModule,
-    JwtModule.register({
-      global: true,
-      secret: jwtConstants.secret,
-      signOptions: { expiresIn: '90s' },
+    JwtModule.registerAsync({
+      imports: [ConfigModule], // Nhập ConfigModule để sử dụng ConfigService
+      useFactory: async (configService: ConfigService) => ({
+        secret: configService.get<string>('JWT_KEY'), // Lấy giá trị từ biến môi trường
+        signOptions: { expiresIn: '60s' }, // Thời gian hết hạn token
+      }),
+      inject: [ConfigService], // Inject ConfigService vào factory
     }),
   ],
   providers: [

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

@@ -2,6 +2,8 @@ import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { UserService } from '../user/user.service.js';
 import * as bcrypt from 'bcrypt';
 import { JwtService } from '@nestjs/jwt';
+import { SignUpDto } from './dto/sign-up.dto.js';
+import { UserEntity } from 'src/entities/user.entity.js';
 @Injectable()
 export class AuthenticationService {
   constructor(
@@ -22,4 +24,33 @@ export class AuthenticationService {
       access_token: await this.jwtService.signAsync(payload),
     };
   }
+
+  async signUp(
+    signUpDto: SignUpDto,
+  ): Promise<{ access_token: string }> {
+    const { 
+      full_name, 
+      phone_number, 
+      email, 
+      password 
+    } = signUpDto
+    const hash_password = await bcrypt.hash(password, 10)
+
+    const user = await this.usersService.create({
+      full_name: full_name,
+      phone_number: phone_number,
+      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 token = await this.jwtService.signAsync(payload)
+    console.log("token: ", token);
+    return {
+      access_token: token
+    };
+  }
 }

backend/src/modules/authentication/constants.ts

@@ -1,5 +0,0 @@
-
-export const jwtConstants = {
-    secret: process.env.JWT_SECRET,
-  };
-  

backend/src/modules/authentication/dto/sign-in.dto.ts

@@ -1,9 +1,10 @@
-import { IsString } from 'class-validator';
+import { IsString, MinLength } from 'class-validator';
 
 export class SignInDto {
   @IsString()
   username: string;
 
   @IsString()
+  @MinLength(8)
   password: string;
 }

backend/src/modules/authentication/dto/sign-up.dto.ts

@@ -0,0 +1,24 @@
+import { 
+    IsString, 
+    IsEmail, 
+    IsMobilePhone, 
+    IsOptional, 
+    IsNumber, 
+    MinLength
+} from "class-validator";
+
+export class SignUpDto{
+    @IsString()
+    full_name: string;
+
+    @IsMobilePhone('vi-VN')
+    phone_number: string;
+
+    @IsOptional()
+    @IsEmail()
+    email?: string;
+
+    @IsString()
+    @MinLength(8)
+    password: string;
+}

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

@@ -2,6 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { UserEntity } from '../../entities/user.entity.js';
+import { SignUpDto } from '../authentication/dto/sign-up.dto.js';
 
 export type User = any;
 
@@ -10,6 +11,19 @@ export class UserService {
   constructor() {}
 
   async findOne(username: string): Promise<UserEntity | undefined> {
-    return UserEntity.findOne({ where: { id: username } });
+    return UserEntity.findOne({ where: { full_name: username } });
+  }
+
+  async create(signUpDto: SignUpDto): Promise<UserEntity | undefined>{
+    return UserEntity.create({
+      full_name: signUpDto.full_name,
+      phone_number: signUpDto.phone_number,
+      email: signUpDto.email,
+      hash_password: signUpDto.password
+    })
+  }
+
+  async save(userEntity: UserEntity): Promise<UserEntity | undefined>{
+    return UserEntity.save(userEntity);
   }
 }