diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6eb58067c..d7ce887a4 100644 --- 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'}" \ No newline at end of file diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index a6ff4cbad..0aba5da78 100644 --- 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'}" \ No newline at end of file + 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'}" \ No newline at end of file diff --git a/api/controllers/actions.ts b/api/controllers/actions.ts index 1699617ec..d715fa99b 100644 --- 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 index 1bbe980da..9e7867dba 100644 --- a/dist/api/controllers/actions.js +++ b/dist/api/controllers/actions.js @@ -54,6 +54,7 @@ function processExtra(req, res) { } catch (e) { console.log(e); + return res_1.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.map b/dist/api/controllers/actions.js.map index 48c7fafe3..5cb02c9d8 100644 --- a/dist/api/controllers/actions.js.map +++ b/dist/api/controllers/actions.js.map @@ -1 +1 @@ -{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../api/controllers/actions.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../api/controllers/actions.ts"],"names":[],"mappings":"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"} \ No newline at end of file