refactor: replace getMissingData with checkEmptyBranch and move action order

Author: jescalada

src/proxy/chain.ts

@@ -5,6 +5,7 @@ import { attemptAutoApproval, attemptAutoRejection } from './actions/autoActions
 
 const pushActionChain: ((req: any, action: Action) => Promise<Action>)[] = [
   proc.push.parsePush,
+  proc.push.checkEmptyBranch,
   proc.push.checkRepoInAuthorisedList,
   proc.push.checkCommitMessages,
   proc.push.checkAuthorEmails,
@@ -13,7 +14,6 @@ const pushActionChain: ((req: any, action: Action) => Promise<Action>)[] = [
   proc.push.writePack,
   proc.push.checkHiddenCommits,
   proc.push.checkIfWaitingAuth,
-  proc.push.getMissingData,
   proc.push.preReceive,
   proc.push.getDiff,
   // run before clear remote

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

@@ -0,0 +1,45 @@
+import { Action, Step } from '../../actions';
+import simpleGit from 'simple-git';
+import { EMPTY_COMMIT_HASH } from '../constants';
+
+const isEmptyBranch = async (action: Action) => {
+  const git = simpleGit(`${action.proxyGitPath}/${action.repoName}`);
+
+  if (action.commitFrom === EMPTY_COMMIT_HASH) {
+    try {
+      const type = await git.raw(['cat-file', '-t', action.commitTo || '']);
+      const known = type.trim() === 'commit';
+      if (known) {
+        return true;
+      }
+    } catch (err) {
+      console.log(`Commit ${action.commitTo} not found: ${err}`);
+    }
+  }
+
+  return false;
+};
+
+const exec = async (req: any, action: Action): Promise<Action> => {
+  const step = new Step('checkEmptyBranch');
+
+  if (action.commitData && action.commitData.length > 0) {
+    return action;
+  }
+
+  if (await isEmptyBranch(action)) {
+    step.setError('Push blocked: Empty branch. Please make a commit before pushing a new branch.');
+    action.addStep(step);
+    step.error = true;
+    return action;
+  } else {
+    step.setError('Push blocked: Commit data not found. Please contact an administrator for support.');
+    action.addStep(step);
+    step.error = true;
+    return action;
+  }
+};
+
+exec.displayName = 'checkEmptyBranch.exec';
+
+export { exec };

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

@@ -8,7 +8,9 @@ const exec = async (req: any, action: Action): Promise<Action> => {
   const user = action.user;
 
   if (!user) {
-    console.log('Action has no user set. This may be due to a fast-forward ref update. Deferring to getMissingData action.');
+    step.setError('Push blocked: User not found. Please contact an administrator for support.');
+    action.addStep(step);
+    step.error = true;
     return action;
   }
 

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

@@ -14,7 +14,7 @@ import { exec as checkCommitMessages } from './checkCommitMessages';
 import { exec as checkAuthorEmails } from './checkAuthorEmails';
 import { exec as checkUserPushPermission } from './checkUserPushPermission';
 import { exec as clearBareClone } from './clearBareClone';
-import { exec as getMissingData } from './getMissingData';
+import { exec as checkEmptyBranch } from './checkEmptyBranch';
 
 export {
   parsePush,
@@ -33,5 +33,5 @@ export {
   checkAuthorEmails,
   checkUserPushPermission,
   clearBareClone,
-  getMissingData,
+  checkEmptyBranch,
 };

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

@@ -97,8 +97,9 @@ describe('checkCommitMessages', () => {
     });
 
     it('should not error when commit data is empty', async () => {
-      // Empty commit data is a valid scenario that happens when making a branch from an unapproved commit
-      // This is remedied in the getMissingData.exec action  
+      // Empty commit data happens when making a branch from an unapproved commit
+      // or when pushing an empty branch or deleting a branch
+      // This is remedied in the checkEmptyBranch.exec action  
       action.commitData = [];
       const result = await exec(req, action);