fix: reset password move to auth

Author: zzswang

openapi.json

@@ -1,5 +1,5 @@
 {
-  "hash": "0eacc23250757482f417c1f6658687b8a20367a3881b8f7c1d1a0dd6a87d4a8a",
+  "hash": "8fa4352badf47ee1a3486b4100f2e79f8f7fe294b54379d7af2067b8eef57d41",
   "openapi": "3.0.0",
   "paths": {
     "/hello": {
@@ -371,6 +371,58 @@
         ]
       }
     },
+    "/auth/@resetPasswordByPhone": {
+      "post": {
+        "operationId": "resetPasswordByPhone",
+        "summary": "",
+        "description": "Reset password by phone",
+        "parameters": [],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ResetPasswordByPhoneDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        },
+        "tags": [
+          "auth"
+        ]
+      }
+    },
+    "/auth/@resetPasswordByEmail": {
+      "post": {
+        "operationId": "resetPasswordByEmail",
+        "summary": "",
+        "description": "Reset password by email",
+        "parameters": [],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ResetPasswordByEmailDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "204": {
+            "description": ""
+          }
+        },
+        "tags": [
+          "auth"
+        ]
+      }
+    },
     "/users": {
       "post": {
         "operationId": "createUser",
@@ -810,41 +862,6 @@
         ]
       }
     },
-    "/users/{userId}/@resetPassword": {
-      "post": {
-        "operationId": "resetPassword",
-        "summary": "",
-        "description": "Reset password",
-        "parameters": [
-          {
-            "name": "userId",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ResetPasswordDto"
-              }
-            }
-          }
-        },
-        "responses": {
-          "204": {
-            "description": ""
-          }
-        },
-        "tags": [
-          "user"
-        ]
-      }
-    },
     "/users/{userId}/@updatePassword": {
       "post": {
         "operationId": "updatePassword",
@@ -3522,6 +3539,60 @@
           "refreshToken"
         ]
       },
+      "ResetPasswordByPhoneDto": {
+        "type": "object",
+        "properties": {
+          "phone": {
+            "type": "string",
+            "description": "手机号"
+          },
+          "key": {
+            "type": "string",
+            "description": "验证码 key"
+          },
+          "code": {
+            "type": "string",
+            "description": "验证码 code"
+          },
+          "password": {
+            "type": "string",
+            "description": "密码"
+          }
+        },
+        "required": [
+          "phone",
+          "key",
+          "code",
+          "password"
+        ]
+      },
+      "ResetPasswordByEmailDto": {
+        "type": "object",
+        "properties": {
+          "email": {
+            "type": "string",
+            "description": "手机号"
+          },
+          "key": {
+            "type": "string",
+            "description": "验证码 key"
+          },
+          "code": {
+            "type": "string",
+            "description": "验证码 code"
+          },
+          "password": {
+            "type": "string",
+            "description": "密码"
+          }
+        },
+        "required": [
+          "email",
+          "key",
+          "code",
+          "password"
+        ]
+      },
       "CreateUserDto": {
         "type": "object",
         "properties": {
@@ -3761,15 +3832,6 @@
           }
         }
       },
-      "ResetPasswordDto": {
-        "type": "object",
-        "properties": {
-          "password": {
-            "type": "string",
-            "description": "密码"
-          }
-        }
-      },
       "UpdatePasswordDto": {
         "type": "object",
         "properties": {

src/auth/auth.controller.ts

@@ -26,6 +26,7 @@ import { GithubDto } from './dto/github.dto';
 import { LoginByEmailDto, LoginByPhoneDto, LoginDto, LogoutDto } from './dto/login.dto';
 import { RefreshTokenDto } from './dto/refresh-token.dto';
 import { RegisterByEmailDto, RegisterbyPhoneDto, RegisterDto } from './dto/register.dto';
+import { ResetPasswordByEmailDto, ResetPasswordByPhoneDto } from './dto/reset-password.dto';
 import { SignTokenDto } from './dto/sign-token.dto';
 import { SessionWithToken, Token } from './entities/session-with-token.entity';
 
@@ -424,4 +425,54 @@ export class AuthController {
       tokenExpireAt,
     };
   }
+
+  /**
+   * Reset password by phone
+   */
+  @ApiOperation({ operationId: 'resetPasswordByPhone' })
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @Post('@resetPasswordByPhone')
+  async resetPasswordByPhone(@Body() dto: ResetPasswordByPhoneDto): Promise<void> {
+    const user = await this.userService.findByPhone(dto.phone);
+    if (!user) {
+      throw new NotFoundException({
+        code: ErrorCodes.USER_NOT_FOUND,
+        message: `User with phone ${dto.phone} not found.`,
+      });
+    }
+
+    if (!(await this.captchaService.consume(dto.key, dto.code))) {
+      throw new BadRequestException({
+        code: ErrorCodes.CAPTCHA_INVALID,
+        message: 'captcha invalid.',
+      });
+    }
+
+    await this.userService.updatePassword(user.id, dto.password);
+  }
+
+  /**
+   * Reset password by email
+   */
+  @ApiOperation({ operationId: 'resetPasswordByEmail' })
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @Post('@resetPasswordByEmail')
+  async resetPasswordByEmail(@Body() dto: ResetPasswordByEmailDto): Promise<void> {
+    const user = await this.userService.findByEmail(dto.email);
+    if (!user) {
+      throw new NotFoundException({
+        code: ErrorCodes.USER_NOT_FOUND,
+        message: `User with email ${dto.email} not found.`,
+      });
+    }
+
+    if (!(await this.captchaService.consume(dto.key, dto.code))) {
+      throw new BadRequestException({
+        code: ErrorCodes.CAPTCHA_INVALID,
+        message: 'captcha invalid.',
+      });
+    }
+
+    await this.userService.updatePassword(user.id, dto.password);
+  }
 }

src/auth/constants.ts

@@ -3,6 +3,7 @@ export const ErrorCodes = {
   USER_ALREADY_EXISTS: 'USER_ALREADY_EXISTS',
   CAPTCHA_INVALID: 'CAPTCHA_INVALID',
   TOO_MANY_LOGIN_ATTEMPTS: 'TOO_MANY_LOGIN_ATTEMPTS',
+  USER_NOT_FOUND: 'USER_NOT_FOUND',
 };
 
 export const GithubAccessTokenUrl = 'https://github.com/login/oauth/access_token';

src/auth/dto/reset-password.dto.ts

@@ -0,0 +1,63 @@
+import { IsEmail, IsMobilePhone, IsNotEmpty, IsString } from 'class-validator';
+
+import { IsPassword } from 'src/common/validate';
+
+export class ResetPasswordByPhoneDto {
+  /**
+   * 手机号
+   */
+  @IsNotEmpty()
+  @IsMobilePhone('zh-CN') // 中国大陆地区手机号
+  phone: string;
+
+  /**
+   * 验证码 key
+   */
+  @IsNotEmpty()
+  @IsString()
+  key: string;
+
+  /**
+   * 验证码 code
+   */
+  @IsNotEmpty()
+  @IsString()
+  code: string;
+
+  /**
+   * 密码
+   */
+  @IsNotEmpty()
+  @IsPassword()
+  password: string;
+}
+
+export class ResetPasswordByEmailDto {
+  /**
+   * 手机号
+   */
+  @IsNotEmpty()
+  @IsEmail()
+  email: string;
+
+  /**
+   * 验证码 key
+   */
+  @IsNotEmpty()
+  @IsString()
+  key: string;
+
+  /**
+   * 验证码 code
+   */
+  @IsNotEmpty()
+  @IsString()
+  code: string;
+
+  /**
+   * 密码
+   */
+  @IsNotEmpty()
+  @IsPassword()
+  password: string;
+}

src/user/user.controller.ts

@@ -29,7 +29,6 @@ import { NamespaceService, ErrorCodes as NsErrCodes } from 'src/namespace';
 import { ErrorCodes } from './constants';
 import { CreateUserDto } from './dto/create-user.dto';
 import { ListUsersQuery } from './dto/list-users.dto';
-import { ResetPasswordDto } from './dto/reset-password.dto';
 import { UpdatePasswordDto } from './dto/update-password.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
 import { User, UserDocument } from './entities/user.entity';
@@ -420,25 +419,6 @@ export class UserController {
     return user.save();
   }
 
-  /**
-   * Reset password
-   */
-  @ApiOperation({ operationId: 'resetPassword' })
-  @HttpCode(HttpStatus.NO_CONTENT)
-  @Post(':userId/@resetPassword')
-  async resetPassword(
-    @Param('userId') userId: string,
-    @Body() dto: ResetPasswordDto
-  ): Promise<void> {
-    const user = await this.userService.updatePassword(userId, dto.password);
-    if (!user) {
-      throw new NotFoundException({
-        code: ErrorCodes.USER_NOT_FOUND,
-        message: `User ${userId} not found.`,
-      });
-    }
-  }
-
   /**
    * Update password
    */