handle action body json parse error

stakwork · Aug 26, 2020 · d87686a · d87686a
1 parent a048ba8
commit d87686a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Git tag
         run: echo "::set-env name=HEAD_TAG::$(git tag --points-at HEAD)"
       - name: Webhook
-        uses: joelwmale/webhook-action@master
+        uses: joelwmale/webhook-action@749e2dcbc6735ce0c36e1dbbb660618cd7b5f91c
         env:
           WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
           data: "{'text': '[GITHUB] New release in sphinx-relay! ${{ env.HEAD_TAG }}', 'action': 'broadcast', 'app': 'github', 'secret': '${{ secrets.WEBHOOK_SECRET }}', 'chat_uuid': 'XzsnzB-numfWNUcTXGkEkoMKCt4k36C2t60a-zohJTWrL--vHjia2WQ11gwbwdAtnsYTT3fyzRhH2YF7KqiOxwnGVlkd'}"
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -9,8 +9,14 @@ jobs:
     runs-on:
       - ubuntu-latest
     steps:
+      - name: Check out from Git
+        uses: actions/checkout@v2
+      - name: Git tag
+        run: echo "::set-env name=COMMIT_MSG::$(git log -1 --pretty=format:%B)"
+      - name: Commit Author
+        run: echo "::set-env name=COMMIT_AUTHOR::$(git log -1 --pretty=format:'%an')"
       - name: Webhook
-        uses: joelwmale/webhook-action@master
+        uses: joelwmale/webhook-action@749e2dcbc6735ce0c36e1dbbb660618cd7b5f91c
         env:
           WEBHOOK_URL: ${{ secrets.WEBHOOK_URL }}
-          data: "{'text': '[GITHUB] New push in sphinx-relay master', 'action': 'broadcast', 'app': 'github', 'secret': '${{ secrets.WEBHOOK_SECRET }}', 'chat_uuid': 'XzsnzB-numfWNUcTXGkEkoMKCt4k36C2t60a-zohJTWrL--vHjia2WQ11gwbwdAtnsYTT3fyzRhH2YF7KqiOxwnGVlkd'}"
+          data: "{'text': 'New push in sphinx-relay by ${{ env.COMMIT_AUTHOR }}: ${{ env.COMMIT_MSG }}', 'action': 'broadcast', 'app': 'github', 'secret': '${{ secrets.WEBHOOK_SECRET }}', 'chat_uuid': 'XzsnzB-numfWNUcTXGkEkoMKCt4k36C2t60a-zohJTWrL--vHjia2WQ11gwbwdAtnsYTT3fyzRhH2YF7KqiOxwnGVlkd'}"
diff --git a/api/controllers/actions.ts b/api/controllers/actions.ts
@@ -39,6 +39,7 @@ async function processExtra(req, res) {
             if(dataBody) body=dataBody
         } catch(e) {
             console.log(e)
+            return failure(res, 'failed to parse webhook body json')
         }
     }
     const {action,app,secret,pubkey,amount,chat_uuid,text} = body

diff --git a/dist/api/controllers/actions.js b/dist/api/controllers/actions.js
diff --git a/dist/api/controllers/actions.js.map b/dist/api/controllers/actions.js.map