Merge pull request #115 from import-ai/fix/auth

fix(auth): fix request format

Author: ycdzj

base.yaml

@@ -67,7 +67,7 @@ services:
       - '-H'
       - 'Content-Type: application/json'
       - '-d'
-      - '{"username":"username","password":"Passw0rd","password_repeat":"Passw0rd","email":"omnibox@qq.com"}'
+      - '{"username":"username","password":"Passw0rd","email":"omnibox@qq.com"}'
     depends_on:
       backend:
         condition: service_healthy

src/app/app.module.ts

@@ -3,8 +3,9 @@ import {
   MiddlewareConsumer,
   Module,
   NestModule,
+  ValidationPipe,
 } from '@nestjs/common';
-import { APP_INTERCEPTOR } from '@nestjs/core';
+import { APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { TagModule } from 'omnibox-backend/tag/tag.module';
 // import { CacheModule } from '@nestjs/cache-manager';
@@ -45,6 +46,10 @@ export class AppModule implements NestModule {
           provide: APP_INTERCEPTOR,
           useClass: SnakeCaseInterceptor,
         },
+        {
+          provide: APP_PIPE,
+          useClass: ValidationPipe,
+        },
       ],
       imports: [
         ConfigModule.forRoot({

src/auth/auth.controller.ts

@@ -36,12 +36,10 @@ export class AuthController {
     @Body('token') token: string,
     @Body('username') username: string,
     @Body('password') password: string,
-    @Body('password_repeat') password_repeat: string,
   ) {
     return await this.authService.signUpConfirm(token, {
       username,
       password,
-      password_repeat,
     });
   }
 
@@ -56,9 +54,8 @@ export class AuthController {
   async resetPassword(
     @Body('token') token: string,
     @Body('password') password: string,
-    @Body('password_repeat') password_repeat: string,
   ) {
-    return this.authService.resetPassword(token, password, password_repeat);
+    return this.authService.resetPassword(token, password);
   }
 
   @Post('invite')

src/auth/auth.service.ts

@@ -81,7 +81,6 @@ export class AuthService {
     data: {
       username: string;
       password: string;
-      password_repeat: string;
     },
   ) {
     const payload: SignUpPayloadDto = await this.jwtVerify(token);
@@ -91,13 +90,17 @@ export class AuthService {
         'The email is already registered. Please log in directly.',
       );
     }
+    if (data.username.length < 2 || data.username.length > 32) {
+      throw new BadRequestException(
+        'Username must be between 2 and 32 characters.',
+      );
+    }
     return await this.dataSource.transaction(async (manager) => {
       const user = await this.userService.create(
         {
           email: payload.email,
           username: data.username,
           password: data.password,
-          password_repeat: data.password_repeat,
         },
         manager,
       );
@@ -137,14 +140,7 @@ export class AuthService {
     // return { url: mailSendUri };
   }
 
-  async resetPassword(
-    token: string,
-    password: string,
-    password_repeat: string,
-  ): Promise<void> {
-    if (password !== password_repeat) {
-      throw new BadRequestException('The passwords entered do not match.');
-    }
+  async resetPassword(token: string, password: string): Promise<void> {
     try {
       const payload = this.jwtService.verify(token);
       const user = await this.userService.find(payload.sub);

src/resources/dto/create-resource.dto.ts

@@ -10,7 +10,7 @@ import { ResourceType } from 'omnibox-backend/resources/resources.entity';
 
 export class CreateResourceDto {
   @IsString()
-  @IsNotEmpty()
+  @IsOptional()
   name: string;
 
   @IsString()

src/resources/dto/update-resource.dto.ts

@@ -11,7 +11,6 @@ import { ResourceType } from 'omnibox-backend/resources/resources.entity';
 export class UpdateResourceDto {
   @IsString()
   @IsOptional()
-  @IsNotEmpty()
   name?: string;
 
   @IsString()

src/resources/wizard-task/index.service.ts

@@ -1,5 +1,8 @@
 import { User } from 'omnibox-backend/user/entities/user.entity';
-import { Resource, ResourceType } from 'omnibox-backend/resources/resources.entity';
+import {
+  Resource,
+  ResourceType,
+} from 'omnibox-backend/resources/resources.entity';
 import { Repository } from 'typeorm';
 import { Task } from 'omnibox-backend/tasks/tasks.entity';
 import {

src/user/dto/create-user.dto.ts

@@ -3,21 +3,22 @@ import {
   IsString,
   MinLength,
   MaxLength,
+  IsNotEmpty,
   IsStrongPassword,
 } from 'class-validator';
 
 export class CreateUserDto {
   @IsString()
-  @MinLength(4)
+  @MinLength(2)
   @MaxLength(32)
   username: string;
 
   @IsEmail()
+  @IsNotEmpty()
   email: string;
 
+  @IsString()
+  @IsNotEmpty()
   @IsStrongPassword({ minLength: 8 })
   password: string;
-
-  @IsStrongPassword({ minLength: 8 })
-  password_repeat: string;
 }

src/user/dto/update-user.dto.ts

@@ -4,32 +4,24 @@ import {
   MinLength,
   MaxLength,
   IsOptional,
-  IsStrongPassword,
 } from 'class-validator';
 
 export class UpdateUserDto {
   @IsString()
-  user_id: string;
-
-  @IsString()
-  @MinLength(4)
+  @MinLength(2)
   @MaxLength(32)
   @IsOptional()
-  username: string;
+  username?: string;
 
   @IsEmail()
   @IsOptional()
-  email: string;
+  email?: string;
 
   @IsString()
   @IsOptional()
-  code: string;
+  code?: string;
 
-  @IsStrongPassword({ minLength: 8 })
-  @IsOptional()
-  password: string;
-
-  @IsStrongPassword({ minLength: 8 })
+  @IsString()
   @IsOptional()
-  password_repeat: string;
+  password?: string;
 }

src/user/user.service.ts

@@ -69,10 +69,6 @@ export class UserService {
       throw new ConflictException('The account already exists');
     }
 
-    if (account.password !== account.password_repeat) {
-      throw new ConflictException('Passwords do not match');
-    }
-
     const hash = await bcrypt.hash(account.password, 10);
     const newUser = repo.create({
       ...account,
@@ -208,10 +204,7 @@ export class UserService {
     if (!existUser) {
       throw new ConflictException('The account does not exist');
     }
-    if (account.password && account.password_repeat) {
-      if (account.password !== account.password_repeat) {
-        throw new ConflictException('Passwords do not match');
-      }
+    if (account.password) {
       existUser.password = await bcrypt.hash(account.password, 10);
     }
     if (account.username && existUser.username !== account.username) {