refactor: checkUserPushPermission.ts logs refactored and test changed accordingly

Author: RichardUri

src/proxy/processors/push-action/checkUserPushPermission.ts

@@ -31,8 +31,8 @@ const validateUser = async (userEmail: string, action: Action, step: Step): Prom
   const list = await getUsers({ email: userEmail });
 
   if (list.length > 1) {
-    console.error(`Multiple users found with email address ${userEmail}, ending`);
     step.error = true;
+    step.log(`Multiple users found with email address ${userEmail}, ending`);
     step.log(
       `Multiple Users have email <${userEmail}> so we cannot uniquely identify the user, ending`,
     );
@@ -43,15 +43,15 @@ const validateUser = async (userEmail: string, action: Action, step: Step): Prom
     action.addStep(step);
     return action;
   } else if (list.length == 0) {
-    console.error(`No user with email address ${userEmail} found`);
+    step.log(`No user with email address ${userEmail} found`);
   } else {
     isUserAllowed = await isUserPushAllowed(action.url, list[0].username);
   }
 
-  console.log(`User ${userEmail} permission on Repo ${action.url} : ${isUserAllowed}`);
+  step.log(`User ${userEmail} permission on Repo ${action.url} : ${isUserAllowed}`);
 
   if (!isUserAllowed) {
-    console.log('User not allowed to Push');
+    step.log('User not allowed to Push');
     step.error = true;
     step.log(`User ${userEmail} is not allowed to push on repo ${action.url}, ending`);
     step.setError(

test/processors/checkUserPushPermission.test.ts

@@ -15,14 +15,10 @@ import { exec } from '../../src/proxy/processors/push-action/checkUserPushPermis
 describe('checkUserPushPermission', () => {
   let getUsersMock: Mock;
   let isUserPushAllowedMock: Mock;
-  let consoleLogSpy: ReturnType<typeof vi.spyOn>;
-  let consoleErrorSpy: ReturnType<typeof vi.spyOn>;
 
   beforeEach(() => {
     getUsersMock = vi.mocked(getUsers);
     isUserPushAllowedMock = vi.mocked(isUserPushAllowed);
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -62,7 +58,7 @@ describe('checkUserPushPermission', () => {
       expect(stepLogSpy).toHaveBeenLastCalledWith(
         'User db-user@test.com is allowed to push on repo https://github.com/finos/git-proxy.git',
       );
-      expect(consoleLogSpy).toHaveBeenLastCalledWith(
+      expect(stepLogSpy).toHaveBeenCalledWith(
         'User db-user@test.com permission on Repo https://github.com/finos/git-proxy.git : true',
       );
     });
@@ -81,7 +77,7 @@ describe('checkUserPushPermission', () => {
         `Your push has been blocked (db-user@test.com is not allowed to push on repo https://github.com/finos/git-proxy.git)`,
       );
       expect(result.steps[0].errorMessage).toContain('Your push has been blocked');
-      expect(consoleLogSpy).toHaveBeenLastCalledWith('User not allowed to Push');
+      expect(stepLogSpy).toHaveBeenCalledWith('User not allowed to Push');
     });
 
     it('should reject push when no user found for git account', async () => {
@@ -110,7 +106,7 @@ describe('checkUserPushPermission', () => {
       expect(stepLogSpy).toHaveBeenLastCalledWith(
         'Your push has been blocked (there are multiple users with email db-user@test.com)',
       );
-      expect(consoleErrorSpy).toHaveBeenLastCalledWith(
+      expect(stepLogSpy).toHaveBeenCalledWith(
         'Multiple users found with email address db-user@test.com, ending',
       );
     });