refactor: check user exists methods

backend/package.json

@@ -56,7 +56,8 @@
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "rxjs": "^7.5.5",
-    "socket.io": "^4.4.1"
+    "socket.io": "^4.4.1",
+    "@faker-js/faker": "^6.0.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^8.2.3",

backend/src/libs/dto/param/email.param.ts

@@ -0,0 +1,7 @@
+import { IsEmail, IsString } from 'class-validator';
+
+export class EmailParam {
+  @IsEmail()
+  @IsString()
+  email!: string;
+}

backend/src/libs/test-utils/mocks/user.mock.ts

@@ -1,8 +1,11 @@
+import { faker } from '@faker-js/faker';
+
 const mockedUser = {
-  _id: '1',
-  email: 'user1@email.com',
-  name: 'John',
-  password: 'hash',
+  _id: faker.datatype.uuid(),
+  email: faker.internet.email(),
+  firstName: faker.name.firstName(),
+  lastName: faker.name.lastName(),
+  password: faker.internet.password(),
 };
 
 export default mockedUser;

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

@@ -9,6 +9,7 @@ import {
   Inject,
   NotFoundException,
   BadRequestException,
+  Param,
 } from '@nestjs/common';
 import LocalAuthGuard from '../../../libs/guards/localAuth.guard';
 import RequestWithUser from '../../../libs/interfaces/requestWithUser.interface';
@@ -23,6 +24,9 @@ import {
 import CreateUserDto from '../../users/dto/create.user.dto';
 import { uniqueViolation } from '../../../infrastructure/database/errors/unique.user';
 import { signIn } from '../shared/login.auth';
+import * as User from '../../users/interfaces/types';
+import { EmailParam } from '../../../libs/dto/param/email.param';
+import { GetUserApplication } from '../../users/interfaces/applications/get.user.application.interface';
 
 @Controller('auth')
 export default class AuthController {
@@ -31,13 +35,21 @@ export default class AuthController {
     private registerAuthApp: RegisterAuthApplication,
     @Inject(TYPES.applications.GetTokenAuthApplication)
     private getTokenAuthApp: GetTokenAuthApplication,
+    @Inject(User.TYPES.applications.GetUserApplication)
+    private getUserApp: GetUserApplication,
   ) {}
 
   @Post('register')
   async register(@Body() registrationData: CreateUserDto) {
     try {
-      const user = await this.registerAuthApp.register(registrationData);
-      return { _id: user._id, name: user.name, email: user.email };
+      const { _id, firstName, lastName, email } =
+        await this.registerAuthApp.register(registrationData);
+      return {
+        _id,
+        firstName,
+        lastName,
+        email,
+      };
     } catch (error) {
       if (error.code === uniqueViolation) {
         throw new BadRequestException(EMAIL_EXISTS);
@@ -65,4 +77,11 @@ export default class AuthController {
     } = request;
     return this.getTokenAuthApp.getAccessToken(id);
   }
+
+  @Get('checkUserEmail/:email')
+  async checkEmail(@Param() emailParam: EmailParam) {
+    const { email } = emailParam;
+    const found = await this.getUserApp.getByEmail(email);
+    return !!found;
+  }
 }

backend/src/modules/auth/shared/login.auth.ts

@@ -9,13 +9,15 @@ export const signIn = async (
   getTokenService: GetTokenAuthService | GetTokenAuthApplication,
   strategy: string,
 ) => {
-  const jwt = await getTokenService.getTokens(user._id);
+  const { email, firstName, lastName, _id } = user;
+  const jwt = await getTokenService.getTokens(_id);
   if (!jwt) return null;
   return {
     ...jwt,
-    email: user.email,
-    name: user.name,
+    email,
+    firstName,
+    lastName,
     strategy,
-    id: user._id,
+    id: _id,
   };
 };

backend/src/modules/azure/controller/azure.controller.ts

@@ -1,23 +1,33 @@
-import { Body, Controller, Get, Inject, Post, Req } from '@nestjs/common';
+import { Body, Controller, Get, Inject, Param, Post } from '@nestjs/common';
+import { EmailParam } from '../../../libs/dto/param/email.param';
 import { AuthAzureApplication } from '../interfaces/applications/auth.azure.application.interface';
 import { AzureToken } from '../interfaces/token.azure.dto';
 import { TYPES } from '../interfaces/types';
+import * as User from '../../users/interfaces/types';
+import { GetUserApplication } from '../../users/interfaces/applications/get.user.application.interface';
 
 @Controller('auth')
 export default class AzureController {
   constructor(
     @Inject(TYPES.applications.AuthAzureApplication)
     private authAzureApp: AuthAzureApplication,
+    @Inject(User.TYPES.applications.GetUserApplication)
+    private getUserApp: GetUserApplication,
   ) {}
 
   @Post('signAzure')
   loginOrRegisterAzureToken(@Body() azureToken: AzureToken) {
     return this.authAzureApp.registerOrLogin(azureToken.token);
   }
 
-  @Get('checkUserExists/:email')
-  checkUserExists(@Req() request) {
-    const { email } = request.params;
-    return this.authAzureApp.checkUserExistsInActiveDirectory(email);
+  @Get('checkUserEmailAD/:email')
+  async checkEmail(@Param() emailParam: EmailParam) {
+    const { email } = emailParam;
+    const existUserInAzure =
+      await this.authAzureApp.checkUserExistsInActiveDirectory(email);
+    if (existUserInAzure) return 'az';
+    const existUserInDB = await this.getUserApp.getByEmail(email);
+    if (existUserInDB) return 'local';
+    return false;
   }
 }

backend/src/modules/azure/interfaces/types.ts

@@ -4,6 +4,6 @@ export const TYPES = {
     CronAzureService: 'CronAzureService',
   },
   applications: {
-    AuthAzureApplication: 'AuthAuthApplication',
+    AuthAzureApplication: 'AuthAzureApplication',
   },
 };

backend/src/modules/azure/services/auth.azure.service.ts

@@ -47,7 +47,8 @@ export default class AuthAzureServiceImpl implements AuthAzureService {
 
     const createdUser = await this.createUserService.create({
       email: email ?? unique_name,
-      name: `${given_name} ${family_name}`,
+      firstName: given_name,
+      lastName: family_name,
     });
     if (createdUser) return signIn(createdUser, this.getTokenService, 'azure');
 

backend/src/modules/users/applications/get.user.application.ts

@@ -0,0 +1,16 @@
+import { Injectable, Inject } from '@nestjs/common';
+import { GetUserApplication } from '../interfaces/applications/get.user.application.interface';
+import { GetUserService } from '../interfaces/services/get.user.service.interface';
+import { TYPES } from '../interfaces/types';
+
+@Injectable()
+export class GetUserApplicationImpl implements GetUserApplication {
+  constructor(
+    @Inject(TYPES.services.GetUserService)
+    private getUserService: GetUserService,
+  ) {}
+
+  getByEmail(email: string) {
+    return this.getUserService.getByEmail(email);
+  }
+}

backend/src/modules/users/dto/create.user.azure.dto.ts

@@ -3,7 +3,11 @@ import { IsNotEmpty, IsString } from 'class-validator';
 export default class CreateUserAzureDto {
   @IsNotEmpty()
   @IsString()
-  name!: string;
+  firstName!: string;
+
+  @IsNotEmpty()
+  @IsString()
+  lastName!: string;
 
   @IsNotEmpty()
   @IsString()

backend/src/modules/users/dto/create.user.dto.ts

@@ -17,7 +17,13 @@ export default class CreateUserDto {
   @IsNotEmpty()
   @MinLength(3)
   @Transform(({ value }: TransformFnParams) => value.trim())
-  name!: string;
+  firstName!: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @MinLength(3)
+  @Transform(({ value }: TransformFnParams) => value.trim())
+  lastName!: string;
 
   @IsString()
   @IsNotEmpty()

backend/src/modules/users/dto/logged.user.dto.ts

@@ -9,7 +9,11 @@ export default class LoggedUserDto {
 
   @IsNotEmpty()
   @IsString()
-  name!: string;
+  firstName!: string;
+
+  @IsNotEmpty()
+  @IsString()
+  lastName!: string;
 
   @IsNotEmpty()
   @IsString()

backend/src/modules/users/dto/user.dto.ts

@@ -8,7 +8,11 @@ export default class UserDto {
 
   @IsNotEmpty()
   @IsString()
-  name!: string;
+  firstName!: string;
+
+  @IsNotEmpty()
+  @IsString()
+  lastName!: string;
 
   @IsNotEmpty()
   @IsString()

backend/src/modules/users/interfaces/applications/get.user.application.interface.ts

@@ -0,0 +1,6 @@
+import { LeanDocument } from 'mongoose';
+import { UserDocument } from '../../schemas/user.schema';
+
+export interface GetUserApplication {
+  getByEmail(email: string): Promise<LeanDocument<UserDocument> | null>;
+}

backend/src/modules/users/interfaces/types.ts

@@ -4,4 +4,7 @@ export const TYPES = {
     GetUserService: 'GetUserService',
     UpdateUserService: 'UpdateUserService',
   },
+  applications: {
+    GetUserApplication: 'GetUserApplication',
+  },
 };

backend/src/modules/users/schemas/user.schema.ts

@@ -6,7 +6,10 @@ export type UserDocument = User & mongoose.Document;
 @Schema()
 export default class User {
   @Prop({ nullable: false })
-  name!: string;
+  firstName!: string;
+
+  @Prop({ nullable: false })
+  lastName!: string;
 
   @Prop({ nullable: false })
   password!: string;

backend/src/modules/users/users.module.ts

@@ -4,11 +4,22 @@ import {
   createUserService,
   getUserService,
   updateUserService,
+  getUserApplication,
 } from './users.providers';
 
 @Module({
   imports: [mongooseUserModule],
-  providers: [createUserService, getUserService, updateUserService],
-  exports: [createUserService, getUserService, updateUserService],
+  providers: [
+    createUserService,
+    getUserService,
+    updateUserService,
+    getUserApplication,
+  ],
+  exports: [
+    createUserService,
+    getUserService,
+    updateUserService,
+    getUserApplication,
+  ],
 })
 export default class UsersModule {}

backend/src/modules/users/users.providers.ts

@@ -1,3 +1,4 @@
+import { GetUserApplicationImpl } from './applications/get.user.application';
 import { TYPES } from './interfaces/types';
 import CreateUserServiceImpl from './services/create.user.service';
 import GetUserServiceImpl from './services/get.user.service';
@@ -15,3 +16,7 @@ export const updateUserService = {
   provide: TYPES.services.UpdateUserService,
   useClass: UpdateUserServiceImpl,
 };
+export const getUserApplication = {
+  provide: TYPES.applications.GetUserApplication,
+  useClass: GetUserApplicationImpl,
+};

backend/test/auth/auth.controller.spec.ts

@@ -16,6 +16,8 @@ import {
 } from '../../src/modules/auth/auth.providers';
 import {
   createUserService,
+  getUserApplication,
+  getUserService,
   updateUserService,
 } from '../../src/modules/users/users.providers';
 
@@ -37,6 +39,8 @@ describe('AuthController', () => {
         registerAuthService,
         updateUserService,
         createUserService,
+        getUserApplication,
+        getUserService,
         ConfigService,
         {
           provide: ConfigService,
@@ -65,7 +69,8 @@ describe('AuthController', () => {
           .post('/auth/register')
           .send({
             email: mockedUser.email,
-            name: mockedUser.name,
+            firstName: mockedUser.firstName,
+            lastName: mockedUser.lastName,
             password: '1!Aab2CD',
           })
           .expect(201);
@@ -81,22 +86,25 @@ describe('AuthController', () => {
         request(app.getHttpServer())
           .post('/auth/register')
           .send({
-            name: mockedUser.name,
+            firstName: mockedUser.firstName,
+            lastName: mockedUser.lastName,
           })
           .expect(400));
       it('should throw an error because full data wasnt submitted', async () =>
         request(app.getHttpServer())
           .post('/auth/register')
           .send({
-            name: mockedUser.name,
+            firstName: mockedUser.firstName,
+            lastName: mockedUser.lastName,
             password: mockedUser.password,
           })
           .expect(400));
       it('should throw an error because password is short', async () => {
         const res = await request(app.getHttpServer())
           .post('/auth/register')
           .send({
-            name: mockedUser.name,
+            firstName: mockedUser.firstName,
+            lastName: mockedUser.lastName,
             password: '1234',
             email: mockedUser.email,
           });