fix: merge commit message when user can't merge (#396)

If the user doesn't have permissions to merge the current PR, we should exit early
refined-bitbucket · Dec 5, 2020 · fe1e03f · fe1e03f
1 parent 46caafa
commit fe1e03f
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 33 deletions.
diff --git a/src/merge-commit-message-new/merge-commit-message-new.js b/src/merge-commit-message-new/merge-commit-message-new.js
@@ -4,6 +4,7 @@ import elementReady from 'element-ready'
 import { getRepoURL, getPullRequestId } from '../page-detect'
 import { getFirstFileContents, setInitialStateInBodyEl } from '../utils'
 import api from '../api'
+import logger from '../logger'
 
 export default async function mergeCommitMessageNew(externalUrl) {
     const mergeCommitTemplateUrls = await getMergeCommitMessageTemplateUrls()
@@ -68,36 +69,44 @@ async function getDataToInject(prId) {
 }
 
 async function insertMergeCommitTemplate(template, dataToInject) {
-    const mergeSpans = await findAllByText(
-        document.body,
-        'Merge',
-        {},
-        {
-            timeout: 90000,
+    try {
+        const mergeSpans = await findAllByText(
+            document.body,
+            'Merge',
+            {},
+            {
+                timeout: 9000,
+            }
+        )
+        const mergeBtns = mergeSpans.map(span => span.closest('button'))
+
+        const onFulfillPullrequest = async () => {
+            const dialog = await elementReady('[role="dialog"]')
+            if (dialog) {
+                const textarea = dialog.querySelector('textarea')
+                const value = template
+                    .replace(/{id}/g, String(dataToInject.id))
+                    .replace(/{title}/g, dataToInject.title)
+                    .replace(/{description}/g, dataToInject.description)
+                    .replace(/{sourceBranch}/g, dataToInject.sourceBranch)
+                    .replace(/{targetBranch}/g, dataToInject.targetBranch)
+                    .replace(/{approvedByList}/g, dataToInject.approvedByList)
+
+                const nativeInputValueSetter = Object.getOwnPropertyDescriptor(
+                    window.HTMLTextAreaElement.prototype,
+                    'value'
+                ).set
+                nativeInputValueSetter.call(textarea, value)
+                textarea.dispatchEvent(new Event('input', { bubbles: true }))
+            }
         }
-    )
-    const mergeBtns = mergeSpans.map(span => span.closest('button'))
-
-    const onFulfillPullrequest = async () => {
-        const dialog = await elementReady('[role="dialog"]')
-        if (dialog) {
-            const textarea = dialog.querySelector('textarea')
-            const value = template
-                .replace(/{id}/g, String(dataToInject.id))
-                .replace(/{title}/g, dataToInject.title)
-                .replace(/{description}/g, dataToInject.description)
-                .replace(/{sourceBranch}/g, dataToInject.sourceBranch)
-                .replace(/{targetBranch}/g, dataToInject.targetBranch)
-                .replace(/{approvedByList}/g, dataToInject.approvedByList)
-
-            const nativeInputValueSetter = Object.getOwnPropertyDescriptor(
-                window.HTMLTextAreaElement.prototype,
-                'value'
-            ).set
-            nativeInputValueSetter.call(textarea, value)
-            textarea.dispatchEvent(new Event('input', { bubbles: true }))
-        }
-    }
 
-    mergeBtns.forEach(b => b.addEventListener('click', onFulfillPullrequest))
+        mergeBtns.forEach(b =>
+            b.addEventListener('click', onFulfillPullrequest)
+        )
+    } catch (error) {
+        logger.info(
+            '[refined-bitbucket] User doesn\'t have permissions to merge this pull request. Skipping "mergeCommitMessage" feature.'
+        )
+    }
 }
diff --git a/src/merge-commit-message/merge-commit-message.js b/src/merge-commit-message/merge-commit-message.js
@@ -4,8 +4,18 @@ import elementReady from 'element-ready'
 import { getRepoURL } from '../page-detect'
 import { getFirstFileContents, getMainBranch } from '../utils'
 import api from '../api'
+import logger from '../logger'
 
 export default async function mergeCommitMessage(externalUrl: string) {
+    const fulfillPr: HTMLElement = getMergeButton()
+
+    if (!fulfillPr) {
+        logger.info(
+            '[refined-bitbucket] User doesn\'t have permissions to merge this pull request. Skipping "mergeCommitMessage" feature.'
+        )
+        return
+    }
+
     const mergeCommitTemplateUrls = getMergeCommitMessageTemplateUrls()
 
     const prNode = await elementReady('#pullrequest')
@@ -62,9 +72,7 @@ async function getDataToInject(prId) {
 }
 
 function insertMergeCommitTemplate(template, dataToInject) {
-    const fulfillPr: HTMLElement = (document.getElementById(
-        'fulfill-pullrequest'
-    ): any)
+    const fulfillPr: HTMLElement = getMergeButton()
 
     const onFulfillPullrequest = async () => {
         fulfillPr.removeEventListener('click', onFulfillPullrequest)
@@ -83,3 +91,10 @@ function insertMergeCommitTemplate(template, dataToInject) {
 
     fulfillPr.addEventListener('click', onFulfillPullrequest)
 }
+
+function getMergeButton() {
+    const fulfillPr: HTMLElement = (document.getElementById(
+        'fulfill-pullrequest'
+    ): any)
+    return fulfillPr
+}