Move confirm email back to auth controller and fix tests

Author: MrBartusek

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

@@ -6,7 +6,7 @@ import { AuthEmailsController } from './auth-emails.controller';
 import { AuthEmailsService } from './auth-emails.service';
 
 @Module({
-	imports: [EmailsModule, forwardRef(() => AuthModule), UsersModule],
+	imports: [EmailsModule, UsersModule, forwardRef(() => AuthModule)],
 	providers: [AuthEmailsService],
 	controllers: [AuthEmailsController],
 	exports: [AuthEmailsService],

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

@@ -4,6 +4,7 @@ import { DemoService } from '../demo/demo.service';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 import { UserRegisterDto } from './dto/user-register.dto';
+import { AuthEmailsService } from '../auth-emails/auth-emails.service';
 
 describe('AuthController', () => {
 	let controller: AuthController;
@@ -23,15 +24,23 @@ describe('AuthController', () => {
 		}),
 	};
 
+	const mockAuthEmailService = {
+		sendEmailConfirmation: jest.fn(() => Promise.resolve()),
+	};
+
+	const sendEmailConfirmationSpy = jest.spyOn(mockAuthEmailService, 'sendEmailConfirmation');
+
 	beforeEach(async () => {
 		const module: TestingModule = await Test.createTestingModule({
 			controllers: [AuthController],
-			providers: [AuthService, DemoService],
+			providers: [AuthService, DemoService, AuthEmailsService],
 		})
 			.overrideProvider(AuthService)
 			.useValue(mockAuthService)
 			.overrideProvider(DemoService)
 			.useValue(mockDemoService)
+			.overrideProvider(AuthEmailsService)
+			.useValue(mockAuthEmailService)
 			.compile();
 
 		controller = module.get<AuthController>(AuthController);
@@ -41,14 +50,20 @@ describe('AuthController', () => {
 		expect(controller).toBeDefined();
 	});
 
-	it('should register', () => {
-		expect(
-			controller.register({ email: '[email protected]', username: 'test', password: 'test' }),
-		).resolves.toEqual(
+	it('should register', async () => {
+		const user = await controller.register({
+			email: '[email protected]',
+			username: 'test',
+			password: 'test',
+		});
+		expect(user).toEqual(
 			expect.objectContaining({
 				email: '[email protected]',
 			}),
 		);
+
+		expect(sendEmailConfirmationSpy).toBeCalledTimes(1);
+		expect(sendEmailConfirmationSpy).toBeCalledWith(user.id);
 	});
 
 	it('should create demo account', async () => {

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

@@ -3,6 +3,7 @@ import {
 	Body,
 	Controller,
 	HttpCode,
+	Logger,
 	Post,
 	Req,
 	UseGuards,
@@ -16,15 +17,19 @@ 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,
 	) {}
 
+	private readonly logger = new Logger(AuthController.name);
+
 	@UseGuards(LocalAuthGuard)
 	@HttpCode(200)
 	@Post('login')
@@ -50,6 +55,11 @@ 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).catch((error) => {
+			this.logger.error(`Failed to send initial confirmation email for ${user._id} - ${error}`);
+		});
+
 		return User.toPrivateDto(user);
 	}
 

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

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

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

@@ -41,12 +41,6 @@ describe('AuthService', () => {
 		}),
 	};
 
-	const mockAuthEmailService = {
-		sendEmailConfirmation: jest.fn(() => Promise.resolve()),
-	};
-
-	const sendEmailConfirmationSpy = jest.spyOn(mockAuthEmailService, 'sendEmailConfirmation');
-
 	beforeEach(async () => {
 		const module: TestingModule = await Test.createTestingModule({
 			providers: [
@@ -55,10 +49,6 @@ describe('AuthService', () => {
 					provide: UsersService,
 					useValue: mockAuthService,
 				},
-				{
-					provide: AuthEmailsService,
-					useValue: mockAuthEmailService,
-				},
 			],
 		}).compile();
 
@@ -83,8 +73,6 @@ describe('AuthService', () => {
 		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,19 +1,13 @@
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import * as bcrypt from 'bcrypt';
+import { Types } from 'mongoose';
 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,
-		private authEmailService: AuthEmailsService,
-	) {}
-
-	private readonly logger = new Logger(AuthService.name);
+	constructor(private usersService: UsersService) {}
 
 	async registerUser(data: UserRegisterDto): Promise<UserDocument> {
 		const hash = await this.hashPassword(data.password);
@@ -24,10 +18,6 @@ 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;
 	}