generate and save token to db + send via sendgrid api

backend/src/app.module.ts

@@ -12,6 +12,7 @@ import { AccessTokenGuard } from './modules/auth-module/common/guards';
 import { DatabaseModule } from './modules/database-module/database.module';
 import { SendgridModule } from './modules/sendgrid-module/sendgrid.module';
 import { UserModule } from './modules/user-module/user.module';
+import { VerifyModule } from './modules/verify-module/verify.module';
 
 @Module({
   imports: [
@@ -22,6 +23,7 @@ import { UserModule } from './modules/user-module/user.module';
     AuthModule,
     UserModule,
     SendgridModule,
+    VerifyModule,
   ],
   controllers: [AppController],
   providers: [AppService, { provide: 'APP_GUARD', useClass: AccessTokenGuard }],

backend/src/entities/email-verification.entity.ts

@@ -0,0 +1,33 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  JoinColumn,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+
+import { UserCredentials } from './user-credentials.entity';
+
+@Entity()
+export class EmailVerification {
+  @PrimaryGeneratedColumn('uuid')
+  public id: string;
+
+  @Column()
+  public token: string;
+
+  @Column()
+  public expiresAt: Date;
+
+  @OneToOne(() => UserCredentials)
+  @JoinColumn({ name: 'userCredentialsId' })
+  public user: UserCredentials;
+
+  @CreateDateColumn()
+  public createdAt: Date;
+
+  @UpdateDateColumn()
+  public updatedAt: Date;
+}

backend/src/entities/index.ts

@@ -1,2 +1,3 @@
 export * from './user-credentials.entity';
 export * from './user-data.entity';
+export * from './email-verification.entity';

backend/src/entities/user-credentials.entity.ts

@@ -9,7 +9,7 @@ import {
 @Entity()
 export class UserCredentials {
   @PrimaryGeneratedColumn('uuid')
-  public id: number;
+  public id: string;
 
   @Column({ unique: true })
   public email: string;

backend/src/modules/auth-module/auth.module.ts

@@ -5,6 +5,7 @@ import { UserCredentials } from 'src/entities';
 
 import { SendgridModule } from '../sendgrid-module/sendgrid.module';
 import { UserModule } from '../user-module/user.module';
+import { VerifyModule } from '../verify-module/verify.module';
 
 import { AuthController } from './controller/auth.controller';
 import { UserCredentialsRepository } from './repositories/user-credentials.repository';
@@ -17,6 +18,7 @@ import { AccessTokenStrategy, RefreshTokenStrategy } from './strategies';
   imports: [
     UserModule,
     SendgridModule,
+    VerifyModule,
     JwtModule.register({}),
     TypeOrmModule.forFeature([UserCredentials]),
   ],

backend/src/modules/auth-module/controller/auth.controller.ts

@@ -50,7 +50,7 @@ export class AuthController {
   })
   @Post('logout')
   @HttpCode(HttpStatus.OK)
-  public async logout(@GetCurrentUserId() userId: number): Promise<boolean> {
+  public async logout(@GetCurrentUserId() userId: string): Promise<boolean> {
     return this.authService.logout(userId);
   }
 
@@ -70,7 +70,7 @@ export class AuthController {
   @Post('refresh')
   @HttpCode(HttpStatus.OK)
   public async refresh(
-    @GetCurrentUserId() userId: number,
+    @GetCurrentUserId() userId: string,
     @GetCurrentUser('refresh_token') refresh_token: string
   ): Promise<TokensDto> {
     return this.authService.refresh(userId, refresh_token);

backend/src/modules/auth-module/repositories/user-credentials.repository.ts

@@ -26,13 +26,13 @@ export class UserCredentialsRepository {
   }
 
   public async findUserById(
-    userId: number
+    userId: string
   ): Promise<UserCredentials | undefined> {
     return this.repository.findOne({ where: { id: userId } });
   }
 
   public async updateUserTokenHash(
-    userId: number,
+    userId: string,
     hashedRt: string | null
   ): Promise<number> {
     const result = await this.repository.update(userId, { hashedRt });

backend/src/modules/auth-module/services/auth.service.ts

@@ -2,6 +2,7 @@ import { ForbiddenException, Injectable } from '@nestjs/common';
 
 import { PasswordConfirmationMailService } from '../../sendgrid-module/services/password-confirmation.mail.service';
 import { UserDataRepository } from '../../user-module/repositories/user-data.repository';
+import { EmailVerificationService } from '../../verify-module/services/email-verification.service';
 import { TokensDto, UserCredentialsDto } from '../models/dto';
 import { UserCredentialsRepository } from '../repositories/user-credentials.repository';
 
@@ -15,7 +16,8 @@ export class AuthService {
     private readonly userDataRepository: UserDataRepository,
     private readonly tokenManagementService: TokenManagementService,
     private readonly encryptionService: EncryptionService,
-    private readonly passwordConfirmationMailService: PasswordConfirmationMailService
+    private readonly passwordConfirmationMailService: PasswordConfirmationMailService,
+    private readonly emailVerificationService: EmailVerificationService
   ) {}
 
   public async signup(userCredentials: UserCredentialsDto): Promise<TokensDto> {
@@ -29,10 +31,15 @@ export class AuthService {
 
     await this.userDataRepository.createInitialUserData(user);
 
-    // TODO Send email confirmation
-    // await this.passwordConfirmationMailService.sendPasswordConfirmationMail(
-    //   user.email
-    // );
+    const token =
+      await this.emailVerificationService.generateEmailVerificationToken(
+        user.id
+      );
+
+    await this.passwordConfirmationMailService.sendPasswordConfirmationMail(
+      user.email,
+      token
+    );
 
     return this.generateAndPersistTokens(user.id, user.email);
   }
@@ -59,7 +66,7 @@ export class AuthService {
   }
 
   public async refresh(
-    userId: number,
+    userId: string,
     refreshToken: string
   ): Promise<TokensDto> {
     const user = await this.userCredentialsRepository.findUserById(userId);
@@ -80,7 +87,7 @@ export class AuthService {
     return this.generateAndPersistTokens(user.id, user.email);
   }
 
-  public async logout(userId: number): Promise<boolean> {
+  public async logout(userId: string): Promise<boolean> {
     const affected = await this.userCredentialsRepository.updateUserTokenHash(
       userId,
       null
@@ -90,7 +97,7 @@ export class AuthService {
   }
 
   private async generateAndPersistTokens(
-    userId: number,
+    userId: string,
     email: string
   ): Promise<TokensDto> {
     const tokens = await this.tokenManagementService.generateTokens(

backend/src/modules/auth-module/services/token-management.service.ts

@@ -26,7 +26,7 @@ export class TokenManagementService {
   }
 
   public async generateTokens(
-    userId: number,
+    userId: string,
     email: string
   ): Promise<TokensDto> {
     const access_token: string = await this.createAccessToken(userId, email);
@@ -36,7 +36,7 @@ export class TokenManagementService {
   }
 
   private async createAccessToken(
-    userId: number,
+    userId: string,
     email: string
   ): Promise<string> {
     return this.jwt.signAsync(
@@ -49,7 +49,7 @@ export class TokenManagementService {
   }
 
   private async createRefreshToken(
-    userId: number,
+    userId: string,
     email: string
   ): Promise<string> {
     return this.jwt.signAsync(

backend/src/modules/database-module/database-config.ts

@@ -1,6 +1,6 @@
 import { ConfigService } from '@nestjs/config';
 import { TypeOrmModuleOptions } from '@nestjs/typeorm';
-import { UserCredentials, UserData } from 'src/entities';
+import { EmailVerification, UserCredentials, UserData } from 'src/entities';
 
 export const databaseConfigFactory = (
   configService: ConfigService
@@ -13,5 +13,5 @@ export const databaseConfigFactory = (
   database: configService.get('DB_NAME'),
   synchronize: true,
   logging: true,
-  entities: [UserCredentials, UserData],
+  entities: [UserCredentials, UserData, EmailVerification],
 });

backend/src/modules/sendgrid-module/services/password-confirmation.mail.service.ts

@@ -16,18 +16,23 @@ export class PasswordConfirmationMailService extends BaseMailService {
     super(sendGridApiKey);
   }
 
-  public async sendPasswordConfirmationMail(to: string): Promise<void> {
+  public async sendPasswordConfirmationMail(
+    to: string,
+    token: string
+  ): Promise<void> {
     const templateId: string = this.templateConfigService.getTemplateId(
       this.PASSWORD_CONFIRMATION_EMAIL
     );
 
+    const encodedToken = encodeURIComponent(token);
+
     const mailoptions: SendGridMailApi.MailDataRequired = {
       to,
       from: { email: 'info@igor-propisnov.com', name: 'Ticket App' },
       templateId: templateId,
       dynamicTemplateData: {
         name: 'Mara',
-        buttonUrl: 'https://igor-propisnov.com',
+        buttonUrl: `http://localhost:4200/?token=${encodedToken}`,
       },
     };
 

backend/src/modules/verify-module/repositories/email-verify.repository.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { EmailVerification } from 'src/entities';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class EmailVerifyRepository {
+  public constructor(
+    @InjectRepository(EmailVerification)
+    private readonly repository: Repository<EmailVerification>
+  ) {}
+
+  public async createEmailVerification(
+    token: string,
+    expiresAt: Date,
+    userId: string
+  ): Promise<void> {
+    await this.repository.save({
+      token,
+      expiresAt,
+      user: { id: userId },
+    });
+  }
+}

backend/src/modules/verify-module/repositories/index.ts

@@ -0,0 +1 @@
+export * from './email-verify.repository';

backend/src/modules/verify-module/services/email-verification.service.ts

@@ -0,0 +1,27 @@
+import { randomBytes } from 'crypto';
+
+import { Injectable } from '@nestjs/common';
+
+import { EmailVerifyRepository } from '../repositories';
+
+@Injectable()
+export class EmailVerificationService {
+  public constructor(
+    private readonly emailVerifyRepository: EmailVerifyRepository
+  ) {}
+
+  public async generateEmailVerificationToken(userId: string): Promise<string> {
+    const token = randomBytes(32).toString('hex');
+
+    // TODO Check users local time zone and set expiration time accordingly
+    const expiration = new Date(Date.now() + 24 * 60 * 60 * 1000);
+
+    this.emailVerifyRepository.createEmailVerification(
+      token,
+      expiration,
+      userId
+    );
+
+    return token;
+  }
+}

backend/src/modules/verify-module/verify.module.ts

@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { EmailVerification } from 'src/entities';
+
+import { EmailVerifyRepository } from './repositories';
+import { EmailVerificationService } from './services/email-verification.service';
+
+@Module({
+  imports: [ConfigModule, TypeOrmModule.forFeature([EmailVerification])],
+  providers: [EmailVerifyRepository, EmailVerificationService],
+  controllers: [],
+  exports: [EmailVerificationService],
+})
+export class VerifyModule {}