Use request data directly

Author: dmarcucci

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:12.10.0-alpine
 
-LABEL "version"="0.1.3"
+LABEL "version"="0.1.4"
 LABEL "repository"="https://github.com/Greenlight-Simulation/secure-actions-webhook"
 LABEL "homepage"="https://github.com/Greenlight-Simulation/secure-actions-webhook"
 LABEL "maintainer"="Dan Marcucci <[email protected]>"

README.md

@@ -8,7 +8,7 @@ Sending a string:
 
 ```yaml
 - name: Webhook
-  uses: Greenlight-Simulation/[email protected].3
+  uses: Greenlight-Simulation/[email protected].4
   env:
     REQUEST_URI: ${{ secrets.REQUEST_URI }}
     REQUEST_DATA: "something_interesting"
@@ -19,7 +19,7 @@ Sending a json string:
 
 ```yaml
 - name: Webhook
-  uses: Greenlight-Simulation/[email protected].3
+  uses: Greenlight-Simulation/[email protected].4
   env:
     REQUEST_URI: ${{ secrets.REQUEST_URI }}
     REQUEST_DATA: '{ "something": "interesting" }'

main.js

@@ -13,20 +13,15 @@ const createHmacSignature = body => {
     return CryptoJS.enc.Base64.stringify(CryptoJS.HmacSHA256(JSON.stringify(body), hmacSecret));
 };
 
-function isJsonString(str) {
-    try {
-        const json = JSON.parse(str);
-        return typeof json === "object";
-    } catch (e) {
-        return false;
-    }
+try {
+    JSON.parse(process.env.REQUEST_DATA);
+} catch (e) {
+    console.error(`REQUEST_DATA (${process.env.REQUEST_DATA}) is not a valid JSON string.`);
+    process.exit(1);
 }
 
 const uri = process.env.REQUEST_URI;
-const data = {
-    data: isJsonString(process.env.REQUEST_DATA) ? JSON.parse(process.env.REQUEST_DATA) : process.env.REQUEST_DATA
-};
-
+const data = JSON.parse(process.env.REQUEST_DATA);
 const signature = createHmacSignature(data);
 
 request(
@@ -42,7 +37,6 @@ request(
             // Something went wrong
             console.error(`Request failed with status code ${response.statusCode}!`);
             console.error(response.body);
-
             process.exit(1);
         } else {
             // Success

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "secure-actions-webhook",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Github Actions secure webhook",
   "main": "main.js",
   "dependencies": {