fix: the email vaerification logic error

database/migrations/1740574122421-AddBusinessFieldsToUserSubscription.ts

@@ -0,0 +1,73 @@
+import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
+
+export class AddBusinessFieldsToUserSubscription1740574122421 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.addColumns("user_subscription", [
+      new TableColumn({
+        name: "businessName",
+        type: "varchar",
+        length: "250",
+        isNullable: true,
+        default: "'Unknown Business'",
+      }),
+      new TableColumn({
+        name: "businessPhone",
+        type: "varchar",
+        length: "50",
+        isNullable: true,
+        default: "''",
+      }),
+      new TableColumn({
+        name: "description",
+        type: "text",
+        // length: "250",
+        isNullable: true,
+        default: "''",
+      }),
+    ]);
+
+    await queryRunner.query(
+      `UPDATE "user_subscription" SET "businessName" = 'Unknown Business', "businessPhone" = '', "description" = '' WHERE "businessName" IS NULL`,
+    );
+
+    await queryRunner.changeColumn(
+      "user_subscription",
+      "businessName",
+      new TableColumn({
+        name: "businessName",
+        type: "varchar",
+        length: "250",
+        isNullable: false,
+      }),
+    );
+
+    await queryRunner.changeColumn(
+      "user_subscription",
+      "businessPhone",
+      new TableColumn({
+        name: "businessPhone",
+        type: "varchar",
+        length: "50",
+        isNullable: false,
+      }),
+    );
+
+    await queryRunner.changeColumn(
+      "user_subscription",
+      "description",
+      new TableColumn({
+        name: "description",
+        type: "text",
+        isNullable: false,
+      }),
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropColumns("user_subscription", [
+      new TableColumn({ name: "businessName", type: "varchar" }),
+      new TableColumn({ name: "businessPhone", type: "varchar" }),
+      new TableColumn({ name: "description", type: "text" }),
+    ]);
+  }
+}

package.json

@@ -113,14 +113,14 @@
       "**/*.(t|j)s"
     ],
     "coverageDirectory": "../coverage",
-    "testEnvironment": "node",
-    "lint-staged": {
-      "**/*.ts": [
-        "pnpm format",
-        "pnpm lint:fix",
-        "git add ."
-      ]
-    }
+    "testEnvironment": "node"
+  },
+  "lint-staged": {
+    "**/*.ts": [
+      "pnpm format",
+      "pnpm lint:fix",
+      "git add ."
+    ]
   },
   "packageManager": "pnpm@9.15.3+sha512.1f79bc245a66eb0b07c5d4d83131240774642caaa86ef7d0434ab47c0d16f66b04e21e0c086eb61e62c77efc4d7f7ec071afad3796af64892fae66509173893a"
 }

src/common/enums/message.enum.ts

@@ -73,8 +73,7 @@ export const enum UserMessage {
   PROFILE_PIC_REQUIRED = "عکس پروفایل نمی‌تواند خالی باشد",
   VERIFY_EMAIL_LINK_SENT = "لینک تایید ایمیل به ایمیل شما ارسال شد",
   EMAIL_VERIFIED = "ایمیل شما تایید شد",
-  INVALID_EMAIL_TOKEN = "توکن ایمیل نامعتبر است",
-  EXPIRED_EMAIL_TOKEN = "توکن ایمیل منقضی شده است",
+  INVALID_EMAIL_TOKEN = "توکن ایمیل نامعتبر است یا منقضی شده است",
   PHONE_EXIST = "شماره تلفن قبلا ثبت شده است",
   ADDRESS_REQUIRED = "آدرس نمی‌تواند خالی باشد",
   ADDRESS_SHOULD_BE_STRING = "آدرس باید یک رشته باشد",
@@ -340,6 +339,11 @@ export const enum SubscriptionMessage {
   SUBS_REQUIRED = "اشتراک مورد نیاز است",
   SUBS_SHOULD_BE_ARRAY = "اشتراک باید یک آرایه باشد",
   USER_SUBS_NOT_FOUND = "اشتراک کاربر یافت نشد",
+  BUSINESS_NAME_REQUIRED = "BUSINESS_NAME_REQUIRED",
+  BUSINESS_NAME_LENGTH = "BUSINESS_NAME_LENGTH",
+  BUSINESS_PHONE_INVALID = "BUSINESS_PHONE_INVALID",
+  DESCRIPTION_LENGTH = "DESCRIPTION_LENGTH",
+  BUSINESS_NAME_STRING = "BUSINESS_NAME_STRING",
 }
 
 export const enum InvoiceMessage {

src/modules/auth/DTO/change-password.dto.ts

@@ -3,7 +3,7 @@ import { IsNotEmpty, IsString, MinLength } from "class-validator";
 
 import { AuthMessage } from "../../../common/enums/message.enum";
 
-export class UpdatePasswordDto {
+export class ChangePasswordDto {
   @IsNotEmpty({ message: AuthMessage.PASSWORD_NOT_EMPTY })
   @IsString({ message: AuthMessage.PASSWORD_FORMAT_INVALID })
   @ApiProperty({ description: "old password", example: "12S345SS678" })

src/modules/auth/auth.controller.ts

@@ -2,16 +2,15 @@ import { Body, Controller, HttpCode, HttpStatus, Patch, Post, UseGuards } from "
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 import { Throttle, ThrottlerGuard } from "@nestjs/throttler";
 
+import { ChangePasswordDto } from "./DTO/change-password.dto";
 import { CompleteRegistrationDto } from "./DTO/complete-register.dto";
 import { CheckUserExistDto, LoginPasswordDTO } from "./DTO/loginPassword.dto";
 import { RequestOtpDto } from "./DTO/request-otp.dto";
-import { UpdatePasswordDto } from "./DTO/update-password.dto";
 import { VerifyOtpDto } from "./DTO/verify-otp.dto";
 import { AuthService } from "./providers/auth.service";
 import { AUTH_THROTTLE_LIMIT, AUTH_THROTTLE_TTL } from "../../common/constants";
 import { AuthGuards } from "../../common/decorators/auth-guard.decorator";
 import { UserDec } from "../../common/decorators/user.decorator";
-import { User } from "../users/entities/user.entity";
 
 @ApiTags("Auth")
 @Controller("auth")
@@ -80,8 +79,8 @@ export class AuthController {
   @ApiOperation({ summary: "Update user password" })
   @HttpCode(HttpStatus.OK)
   @Patch("change-password")
-  updatePassword(@UserDec() user: User, @Body() updatePasswordDto: UpdatePasswordDto) {
-    return this.authService.updatePassword(user.id, updatePasswordDto);
+  changePassword(@UserDec("id") userId: string, @Body() changePasswordDto: ChangePasswordDto) {
+    return this.authService.changePassword(userId, changePasswordDto);
   }
   //***************************** */
 

src/modules/auth/providers/auth.service.ts

@@ -10,10 +10,10 @@ import { UsersService } from "../../users/providers/users.service";
 import { OTPService } from "../../utils/providers/otp.service";
 import { PasswordService } from "../../utils/providers/password.service";
 import { SmsService } from "../../utils/providers/sms.service";
+import { ChangePasswordDto } from "../DTO/change-password.dto";
 import { CompleteRegistrationDto } from "../DTO/complete-register.dto";
 import { CheckUserExistDto, LoginPasswordDTO } from "../DTO/loginPassword.dto";
 import { RequestOtpDto } from "../DTO/request-otp.dto";
-import { UpdatePasswordDto } from "../DTO/update-password.dto";
 import { VerifyOtpDto } from "../DTO/verify-otp.dto";
 
 @Injectable()
@@ -204,7 +204,7 @@ export class AuthService {
   }
   //****************** */
 
-  async updatePassword(userId: string, updateDto: UpdatePasswordDto) {
+  async changePassword(userId: string, updateDto: ChangePasswordDto) {
     const { user } = await this.usersService.findOneById(userId);
 
     const passCompare = await this.passwordService.comparePassword(updateDto.password, user.password);