test: fix auth tests after changes

Author: dnechay

packages/apps/reputation-oracle/server/src/modules/auth/auth.service.spec.ts

@@ -42,6 +42,7 @@ import {
   UserEntity,
   UserRepository,
   UserService,
+  type OperatorUserEntity,
 } from '../user';
 import { Web3Service } from '../web3/web3.service';
 import {
@@ -163,6 +164,7 @@ describe('AuthService', () => {
       email: signInDto.email,
       password: MOCK_HASHED_PASSWORD,
       status: UserStatus.ACTIVE,
+      role: UserRole.WORKER,
     };
 
     let findOneByEmailMock: any;
@@ -185,7 +187,15 @@ describe('AuthService', () => {
 
       const result = await authService.signin(signInDto);
 
-      expect(findOneByEmailMock).toHaveBeenCalledWith(signInDto.email);
+      expect(findOneByEmailMock).toHaveBeenCalledWith(signInDto.email, {
+        relations: {
+          kyc: true,
+          siteKeys: true,
+          userQualifications: {
+            qualification: true,
+          },
+        },
+      });
       expect(authService.auth).toHaveBeenCalledWith(userEntity);
       expect(result).toStrictEqual({
         accessToken: MOCK_ACCESS_TOKEN,
@@ -200,7 +210,15 @@ describe('AuthService', () => {
         new AuthError(AuthErrorMessage.INVALID_CREDENTIALS),
       );
 
-      expect(findOneByEmailMock).toHaveBeenCalledWith(signInDto.email);
+      expect(findOneByEmailMock).toHaveBeenCalledWith(signInDto.email, {
+        relations: {
+          kyc: true,
+          siteKeys: true,
+          userQualifications: {
+            qualification: true,
+          },
+        },
+      });
     });
   });
 
@@ -216,6 +234,7 @@ describe('AuthService', () => {
       id: 1,
       email: userCreateDto.email,
       password: MOCK_HASHED_PASSWORD,
+      role: UserRole.WORKER,
     };
 
     let createUserMock: any;
@@ -233,15 +252,14 @@ describe('AuthService', () => {
     });
 
     it('should create a new user and return the user entity', async () => {
-      const result = await authService.signup(userCreateDto);
+      await authService.signup(userCreateDto);
 
       expect(userService.createWorkerUser).toHaveBeenCalledWith(userCreateDto);
       expect(tokenRepository.createUnique).toHaveBeenCalledWith({
         type: TokenType.EMAIL,
-        user: userEntity,
+        userId: userEntity.id,
         expiresAt: expect.any(Date),
       });
-      expect(result).toBe(userEntity);
     });
 
     it("should call emailService sendEmail if user's email is valid", async () => {
@@ -411,7 +429,7 @@ describe('AuthService', () => {
       const tokenEntity: Partial<TokenEntity> = {
         uuid: v4(),
         type: TokenType.EMAIL,
-        user: userEntity as UserEntity,
+        userId: userEntity.id,
       };
 
       let findTokenMock: any;
@@ -459,7 +477,9 @@ describe('AuthService', () => {
           new Date().setDate(new Date().getDate() + 1),
         );
         findTokenMock.mockResolvedValue(tokenEntity as TokenEntity);
-        userService.updatePassword = jest.fn();
+        userService.updatePassword = jest
+          .fn()
+          .mockResolvedValueOnce(userEntity);
         emailService.sendEmail = jest.fn();
 
         const updatePasswordMock = jest.spyOn(userService, 'updatePassword');
@@ -485,7 +505,7 @@ describe('AuthService', () => {
       const tokenEntity: Partial<TokenEntity> = {
         uuid: v4(),
         type: TokenType.EMAIL,
-        user: userEntity as UserEntity,
+        userId: userEntity.id,
       };
 
       let findTokenMock: any;
@@ -506,6 +526,7 @@ describe('AuthService', () => {
           new AuthError(AuthErrorMessage.INVALID_REFRESH_TOKEN),
         );
       });
+
       it('should throw an error if token is expired', () => {
         tokenEntity.expiresAt = new Date(new Date().getDate() - 1);
         findTokenMock.mockResolvedValue(tokenEntity as TokenEntity);
@@ -521,12 +542,16 @@ describe('AuthService', () => {
           new Date().setDate(new Date().getDate() + 1),
         );
         findTokenMock.mockResolvedValue(tokenEntity as TokenEntity);
-        userRepository.updateOne = jest.fn();
+        userRepository.updateOneById = jest.fn();
 
         await authService.emailVerification({ token: 'token' });
 
-        expect(userRepository.updateOne).toHaveBeenCalled();
-        expect(tokenEntity.user?.status).toBe(UserStatus.ACTIVE);
+        expect(userRepository.updateOneById).toHaveBeenCalledWith(
+          userEntity.id,
+          {
+            status: UserStatus.ACTIVE,
+          },
+        );
       });
     });
 
@@ -609,28 +634,25 @@ describe('AuthService', () => {
           nonce,
         };
 
-        let getByAddressMock: any;
         let updateNonceMock: any;
 
         beforeEach(() => {
-          getByAddressMock = jest.spyOn(userRepository, 'findOneByAddress');
+          jest
+            .spyOn(userService, 'findOperatorUser')
+            .mockResolvedValue(userEntity as OperatorUserEntity);
           updateNonceMock = jest.spyOn(userService, 'updateNonce');
 
           jest.spyOn(authService, 'auth').mockResolvedValue({
             accessToken: MOCK_ACCESS_TOKEN,
             refreshToken: MOCK_REFRESH_TOKEN,
           });
-          jest
-            .spyOn(userRepository, 'findOneByAddress')
-            .mockResolvedValue({ nonce: nonce } as any);
         });
 
         afterEach(() => {
           jest.clearAllMocks();
         });
 
         it('should sign in the user, reset nonce and return the JWT', async () => {
-          getByAddressMock.mockResolvedValue(userEntity as UserEntity);
           updateNonceMock.mockResolvedValue({
             ...userEntity,
             nonce: nonce1,
@@ -649,7 +671,7 @@ describe('AuthService', () => {
             signature,
           });
 
-          expect(userRepository.findOneByAddress).toHaveBeenCalledWith(
+          expect(userService.findOperatorUser).toHaveBeenCalledWith(
             MOCK_ADDRESS,
           );
           expect(userService.updateNonce).toHaveBeenCalledWith(userEntity);