Fix tests for email confirm

Author: MrBartusek

apps/api/src/auth/auth.controller.ts

@@ -16,15 +16,13 @@ import { AuthService } from './auth.service';
 import { UserRegisterDto } from './dto/user-register.dto';
 import { AuthenticatedGuard } from './guards/authenticated.guard';
 import { LocalAuthGuard } from './guards/local-auth.guard';
-import { AuthEmailsService } from '../auth-emails/auth-emails.service';
 
 @Controller('auth')
 @ApiTags('auth')
 export class AuthController {
 	constructor(
 		private readonly authService: AuthService,
 		private readonly demoService: DemoService,
-		private readonly authEmailsService: AuthEmailsService,
 	) {}
 
 	@UseGuards(LocalAuthGuard)
@@ -52,7 +50,6 @@ export class AuthController {
 	@Post('register')
 	async register(@Body() body: UserRegisterDto): Promise<PrivateUserDto> {
 		const user = await this.authService.registerUser(body);
-		await this.authEmailsService.sendEmailConfirmation(user._id);
 		return User.toPrivateDto(user);
 	}
 

apps/api/src/auth/auth.module.ts

@@ -11,12 +11,7 @@ import { SessionSerializer } from './session.serializer';
 import { LocalStrategy } from './strategies/local.strategy';
 
 @Module({
-	imports: [
-		UsersModule,
-		DemoModule,
-		PassportModule.register({ session: true }),
-		forwardRef(() => AuthEmailsModule),
-	],
+	imports: [UsersModule, DemoModule, PassportModule.register({ session: true })],
 	controllers: [AuthController],
 	providers: [
 		AuthService,

apps/api/src/auth/auth.service.spec.ts

@@ -2,6 +2,8 @@ import { Test, TestingModule } from '@nestjs/testing';
 import * as bcrypt from 'bcrypt';
 import { UsersService } from '../models/users/users.service';
 import { AuthService } from './auth.service';
+import { AuthEmailsService } from '../auth-emails/auth-emails.service';
+import { Types } from 'mongoose';
 
 const MOCK_PASSWORD = 'test-password';
 
@@ -27,6 +29,7 @@ describe('AuthService', () => {
 
 		create: jest.fn((data) => {
 			return {
+				_id: new Types.ObjectId(),
 				profile: {
 					email: data.email,
 					username: data.username,
@@ -38,10 +41,11 @@ describe('AuthService', () => {
 		}),
 	};
 
-	beforeAll(async () => {
-		mockPassword = MOCK_PASSWORD;
-		mockPasswordHashed = await bcrypt.hash(mockPassword, 4);
-	});
+	const mockAuthEmailService = {
+		sendEmailConfirmation: jest.fn(() => Promise.resolve()),
+	};
+
+	const sendEmailConfirmationSpy = jest.spyOn(mockAuthEmailService, 'sendEmailConfirmation');
 
 	beforeEach(async () => {
 		const module: TestingModule = await Test.createTestingModule({
@@ -51,26 +55,36 @@ describe('AuthService', () => {
 					provide: UsersService,
 					useValue: mockAuthService,
 				},
+				{
+					provide: AuthEmailsService,
+					useValue: mockAuthEmailService,
+				},
 			],
 		}).compile();
 
 		service = module.get<AuthService>(AuthService);
 	});
 
+	beforeAll(async () => {
+		mockPassword = MOCK_PASSWORD;
+		mockPasswordHashed = await bcrypt.hash(mockPassword, 4);
+	});
+
 	it('should be defined', () => {
 		expect(service).toBeDefined();
 	});
 
-	it('should register user', () => {
-		expect(
-			service.registerUser({
-				email: '[email protected]',
-				username: 'username',
-				password: 'password',
-			}),
-		).resolves.toEqual(
+	it('should register user', async () => {
+		const user = await service.registerUser({
+			email: '[email protected]',
+			username: 'username',
+			password: 'password',
+		});
+		expect(user).toEqual(
 			expect.objectContaining({ profile: expect.objectContaining({ username: 'username' }) }),
 		);
+		expect(sendEmailConfirmationSpy).toBeCalledTimes(1);
+		expect(sendEmailConfirmationSpy).toBeCalledWith(user._id);
 	});
 
 	describe('User validation', () => {

apps/api/src/auth/auth.service.ts

@@ -1,13 +1,19 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
 import { UserDocument } from '../models/users/schemas/user.schema';
 import { UsersService } from '../models/users/users.service';
 import { UserRegisterDto } from './dto/user-register.dto';
 import { Types } from 'mongoose';
+import { AuthEmailsService } from '../auth-emails/auth-emails.service';
 
 @Injectable()
 export class AuthService {
-	constructor(private usersService: UsersService) {}
+	constructor(
+		private usersService: UsersService,
+		private authEmailService: AuthEmailsService,
+	) {}
+
+	private readonly logger = new Logger(AuthService.name);
 
 	async registerUser(data: UserRegisterDto): Promise<UserDocument> {
 		const hash = await this.hashPassword(data.password);
@@ -18,6 +24,10 @@ export class AuthService {
 			passwordHash: hash,
 		});
 
+		await this.authEmailService.sendEmailConfirmation(user._id).catch((error) => {
+			this.logger.error(`Failed to send initial confirmation email for ${user._id} - ${error}`);
+		});
+
 		return user;
 	}