@webqit/webflo 0.8.54-0 → 0.8.58-0

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.8.54-0",
+  "version": "0.8.58-0",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/services/origins/index.js

@@ -140,28 +140,24 @@ export async function deploy(Ui, origin, flags = {}, layout = {}) {
  */
 export async function hook(Ui, event, deployCallback, flags = {}, layout = {}) {
     const eventHandler = Webhooks.createEventHandler();
-    console.log('-------------------------event.request.headers', event.request.headers)
-    if (event.request.headers['user-agent'] && event.request.headers['user-agent'].startsWith('GitHub-Hookshot/')) {
-        console.log('-------------------------111111111111111111')
-        const submits = await event.request.parse();
-        console.log('-------------------------submits', submits)
-        const matches = (await origins.match(submits.payload.repository.full_name, flags, layout)).filter(o => o.autodeploy);
-        console.log('-------------------------matches', matches)
+    if (event.request.headers.has('user-agent') && event.request.headers.get('user-agent').startsWith('GitHub-Hookshot/')) {
+        const payload = await event.request.json();
+        const matches = (await origins.match(payload.repository.full_name, flags, layout)).filter(o => o.autodeploy);
         var deployParams;
         if (!(deployParams = matches[0])) {
             return;
         }
         if (matches.length > 1) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): Multiple deploy settings found.`);
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): Multiple deploy settings found.`);
         }
         if (!deployParams.autodeploy_secret) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): The deploy settings do not contain a secret.`);
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): The deploy settings do not contain a secret.`);
         }
-        if (!Webhooks.verify(deployParams.autodeploy_secret, submits.payload, event.request.headers['x-hub-signature'])) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): Signature mismatch.`);
+        if (!Webhooks.verify(deployParams.autodeploy_secret, payload, event.request.headers.get('x-hub-signature'))) {
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): Signature mismatch.`);
         }
-        if (submits.payload.repository.disabled || submits.payload.repository.archived) {
-            throw new Error(`Failed deploy attempt (${submits.payload.repository.full_name}): Repository disabled or archived.`);
+        if (payload.repository.disabled || payload.repository.archived) {
+            throw new Error(`Failed deploy attempt (${payload.repository.full_name}): Repository disabled or archived.`);
         }
         eventHandler.on('push', async ({ name, payload }) => {
             Ui.log('---------------------------');
@@ -182,9 +178,9 @@ export async function hook(Ui, event, deployCallback, flags = {}, layout = {}) {
             }
         });
         return eventHandler.receive({
-            id: event.request.headers['x-github-delivery'],
-            name: event.request.headers['x-github-event'],
-            payload: submits.payload /* JSON object */,
+            id: event.request.headers.get('x-github-delivery'),
+            name: event.request.headers.get('x-github-event'),
+            payload: payload /* JSON object */,
         });
     }
 }