multipart support, deactivate bug, local require PipedreamHQ#49

Laura0711 · Jun 2, 2020 · 65e3e15 · 65e3e15
2 parents 8d2c2d4 + 269f8d9
commit 65e3e15
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 37 deletions.
diff --git a/components/jotform/jotform.app.js b/components/jotform/jotform.app.js
@@ -66,9 +66,15 @@ module.exports = {
     },
     async deleteHook(opts = {}) { 
       const { formId, endpoint } = opts
-      const webhooks = (await this.getWebhooks({ formId })).content
-      const webhookIdx = webhooks.findIndex(w => w === ensureTrailingSlash(endpoint))
-      if(webhookIdx !== -1) {
+      const result = await this.getWebhooks({ formId }) 
+      let webhooks = Object.values(result && result.content || {})
+      let webhookIdx = -1 
+      for (let idx in webhooks) {
+        if (webhooks[idx] === ensureTrailingSlash(endpoint)) {
+          webhookIdx = idx
+        }
+      }
+      if(webhookIdx === -1) {
         console.log(`Did not detect ${endpoint} as a webhook registered for form ID ${formId}.`)
         return
       }

diff --git a/components/jotform/new-submission.js b/components/jotform/new-submission.js
@@ -1,5 +1,4 @@
-const jotform = require('https://github.com/PipedreamHQ/pipedream/components/jotform/jotform.app.js')
-const busboy = require('busboy')
+const jotform = require('./jotform.app.js')
 
 module.exports = {
   name: "new-submission", 
@@ -28,38 +27,9 @@ module.exports = {
       status: 200,
     })
 
-    const bb = new busboy({ headers: event.headers });
-    let fileData = {}
-    let formData = {}
-
-    await new Promise((resolve, reject) => {
-      bb.on('file', function (fieldname, file, filename, encoding, mimetype) {
-        //console.log('File [%s]: filename=%j; encoding=%j; mimetype=%j', fieldname, filename, encoding, mimetype);
-        fileData.file = filename
-        fileData.fileName = filename
-        fileData.encoding = encoding
-        fileData.mimetype = mimetype
-        fileData.data = {}
-
-        file
-        .on('data', data => {
-          fileData.data[fieldname] = data.length
-        })
-      }).on('field', (fieldname, val) => {
-        try {
-          formData[fieldname] = JSON.parse(val)
-        } catch (err) {
-          formData[fieldname] = val
-        }
-      })
-      .on("finish", resolve)
-      .on('error', reject)
-      bb.end(event.body)
-    })
-
-    this.$emit(formData, {
-      summary: JSON.stringify(formData.rawRequest || formData),
-      id: formData.submissionID,
+    this.$emit(event.body, {
+      summary: event.body.rawRequest || JSON.stringify(event.body),
+      id: event.body.submissionID,
     })
   },
 }