fixing registration flow

Author: daniwebdev

migrations/1696849524727-createUsersTable.ts

@@ -7,6 +7,8 @@ export class CreateUsersTable1696849524727 implements MigrationInterface {
             name: 'users',
             columns: [
                 {name: "id",type: "int",isPrimary: true,isGenerated: true},
+                {name: "code",type: "varchar",isNullable: false},
+                {name: "referral",type: "varchar",isNullable: true},
                 {name: "uuid",type: "varchar",isUnique: true},
                 {name: "name", type: "varchar"},
                 {name: "username",type: "varchar",isUnique: true},

migrations/1697109279164-CreateNewAdminUser.ts

@@ -1,4 +1,5 @@
 import { hash } from 'bcrypt';
+import { getRandomValues } from 'crypto';
 import { MigrationInterface, QueryRunner } from "typeorm"
 import { v4 } from 'uuid';
 
@@ -15,6 +16,7 @@ export class CreateNewAdminUser1697109279164 implements MigrationInterface {
 
         const query = queryRunner.manager.createQueryBuilder();
         await query.insert().into('users').values([{
+            "code": "ABCDEF",
             "uuid": v4(),
             "username": "admin",
             "name": "Admin",

migrations/1697110840362-CreateUserDevices.ts

@@ -13,14 +13,14 @@ export class CreateUserDevices1697110840362 implements MigrationInterface {
                 { name: 'brand', type: 'varchar' },
                 { name: 'os', type: 'varchar' },
                 { name: 'platform', type: 'varchar' },
-                { name: 'last_login', type: 'json' },
-                { name: 'current_login', type: 'json' },
+                { name: 'last_login', type: 'json', isNullable: true },
+                { name: 'current_login', type: 'json', isNullable: true },
                 { name: 'access_token', type: 'varchar', isNullable: true },
                 { name: 'refresh_token', type: 'varchar', isNullable: true },
-                { name: 'fcm_token', type: 'varchar' },
-                { name: 'preference', type: 'varchar' },
-                { name: 'status', type: 'varchar' },
-                { name: 'status_reason', type: 'varchar' },
+                { name: 'fcm_token', type: 'varchar', isNullable: true },
+                { name: 'preference', type: 'json', isNullable: true },
+                { name: 'status', type: 'varchar', isNullable: true },
+                { name: 'status_reason', type: 'varchar', isNullable: true },
                 { name: 'updated_at', type: 'timestamp', default: 'now()' },
                 { name: 'created_at', type: 'timestamp', default: 'now()' },
             ],

nest-cli.json

@@ -14,6 +14,11 @@
         "include": "i18n/**/*",
         "watchAssets": true,
         "outDir": "dist"
+      },
+      {
+        "include": "shared/send-email/templates/**/*",
+        "watchAssets": true,
+        "outDir": "dist"
       }
     ]
   }

src/apps/auth/auth.controller.ts

@@ -51,6 +51,7 @@ export class AuthController {
 
     @Post('/register')
     @HttpCode(HttpStatus.CREATED)
+    @ApiBody({type: () => RegisterDTO})
     async register(
         @I18n() i18n: I18nContext,
         @Req() req: Request,

src/apps/auth/auth.module.ts

@@ -6,11 +6,13 @@ import { User } from 'src/entities/user.entity';
 import { UserDevice } from 'src/entities/user-device.entity';
 import { AccessTokenStrategy, RefreshTokenStrategy } from './strategies';
 import { RedisModule } from 'src/shared/redis/redis.module';
+import { SendEmailModule } from 'src/shared/send-email/send-email.module';
 
 @Module({
   imports: [
     TypeOrmModule.forFeature([User, UserDevice]),
     RedisModule,
+    SendEmailModule
   ],
   providers: [AuthService, AccessTokenStrategy, RefreshTokenStrategy],
   controllers: [AuthController]

src/apps/auth/auth.service.ts

@@ -12,6 +12,7 @@ import { UserDevice } from 'src/entities/user-device.entity';
 import { DeviceDTO } from './dto/device.dto';
 import { RedisService } from 'src/shared/redis/redis.service';
 import { I18nService } from 'nestjs-i18n';
+import { SendEmailService } from 'src/shared/send-email/send-email.service';
 
 @Injectable()
 export class AuthService {
@@ -25,6 +26,7 @@ export class AuthService {
         private readonly redisService: RedisService,
         private readonly jwtService: JwtService,
         private readonly configService: ConfigService,
+        private readonly sendEmailService: SendEmailService<User>,
     ) {}
 
     async logout(userAuth: UserInAuth) {
@@ -178,6 +180,12 @@ export class AuthService {
                 access_token: await this.makeHash(tokens.access_token),
                 refresh_token: await this.makeHash(tokens.refresh_token),
                 status: 'allowed',
+                current_login: {
+                    ip: req.ip,
+                    app_version: req.header('x-app-version'),
+                    timestamp: new Date().getTime(),
+                    coordinate,
+                },
                 last_login: {
                     ip: req.ip,
                     app_version: req.header('x-app-version'),
@@ -193,6 +201,9 @@ export class AuthService {
                 id: newUser.id,
             }, manager)
 
+            await this.sendEmailService.welcomeRegisterEmail(newUser.email, newUser)
+
+
             // Return any additional information you may want to provide after successful registration
             // For example, you can return the newly created user entity with sensitive information (like password) removed.
             return {

src/apps/auth/dto/register.dto.ts

@@ -1,25 +1,36 @@
-import { IsNotEmpty } from "class-validator";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEmail, IsNotEmpty } from "class-validator";
 import { Unique } from "typeorm";
 import { CoordinateDTO } from "./coordinate.dto";
 import { DeviceDTO } from "./device.dto";
 
 export class RegisterDTO {
+
+    @ApiProperty({example: "John Doe"})
     @IsNotEmpty()
     name: string;
 
+    @ApiProperty({example: "john.doe"})
     @IsNotEmpty()
     @Unique('users', ['username'])
     username: string;
 
+    @ApiProperty({example: "[email protected]"})
+    @IsEmail()
     email: string;
 
+    @ApiProperty({example: "085717453300"})
     phone: string;
 
+    @ApiProperty({example: "secret"})
     password: string;
 
+    @ApiProperty()
     coordinate: CoordinateDTO;
 
+    @ApiProperty()
     device: DeviceDTO;
 
+    @ApiProperty({example: ""})
     refferal_code: string;
 }

src/apps/user/user.service.ts

@@ -25,8 +25,7 @@ export class UserService {
             select: {
                 id: true,
                 code: true,
-                referral_code: true,
-                referral_link: true,
+                referral: true,
                 uuid: true,
                 username: true,
                 name: true,

src/config/mail.config.ts

@@ -29,7 +29,8 @@ export const mailerConfigAsync: MailerAsyncOptions = {
                 from: process.env.MAIL_FROM_DEFAULT,
             },
             template: {
-                dir: __dirname + '/../utils/send-email/templates',
+                //src/shared/send-email/templates
+                dir: __dirname + '/../shared/send-email/templates',
                 adapter: new EjsAdapter(),
                 options: {
                     // strict: true, // locals.contextData