@tiledesk/tiledesk-whatsapp-connector 0.1.18 → 0.1.20

package/index.js

@@ -1,6 +1,5 @@
 "use strict";
 const express = require("express");
-const app = express();
 const router = express.Router();
 const bodyParser = require("body-parser");
 const appRoot = require('app-root-path');
@@ -174,7 +173,7 @@ router.get('/configure', async (req, res) => {
   let token = "";
 
   projectId = req.query.project_id;
-  token = req.query.token
+  token = req.query.token;
 
   let CONTENT_KEY = "whatsapp-" + projectId;
 
@@ -585,6 +584,10 @@ router.post("/webhook/:project_id", async (req, res) => {
 
           const filename = await util.downloadMedia(media.id);
           console.log("File position: ", filename);
+          if (!filename) {
+            console.log("Unable to download media. Message not sent.");
+            res.status(500).send({ success: false, error: "unable to download media" })
+          }
           let file_path = path.join(__dirname, 'tmp', filename);
 
           const image_url = await util.uploadMedia(file_path, "images");
@@ -599,6 +602,10 @@ router.post("/webhook/:project_id", async (req, res) => {
 
           const filename = await util.downloadMedia(media.id);
           console.log("File position: ", filename);
+          if (!filename) {
+            console.log("Unable to download media. Message not sent.");
+            res.status(500).send({ success: false, error: "unable to download media" })
+          }
           let file_path = path.join(__dirname, 'tmp', filename);
 
 
@@ -613,6 +620,10 @@ router.post("/webhook/:project_id", async (req, res) => {
 
           const filename = await util.downloadMedia(media.id);
           console.log("File position: ", filename);
+          if (!filename) {
+            console.log("Unable to download media. Message not sent.");
+            res.status(500).send({ success: false, error: "unable to download media" })
+          }
           let file_path = path.join(__dirname, 'tmp', filename);
 
           const media_url = await util.uploadMedia(file_path, "files");
@@ -650,13 +661,22 @@ router.get("/webhook/:project_id", async (req, res) => {
    * UPDATE YOUR VERIFY TOKEN
    *This will be the Verify Token value when you set up webhook
   **/
+  console.log("\nVerify the webhook: ", req);
+  console.log("\req.query: ", req.query);
 
   // Parse params from the webhook verification request
   let mode = req.query["hub.mode"];
   let token = req.query["hub.verify_token"];
   let challenge = req.query["hub.challenge"];
 
+  console.log("**********")
+  console.log("mode: ", mode)
+  console.log("token: ", token)
+  console.log("challenge: ", challenge)
+  console.log("**********")
+
   let CONTENT_KEY = "whatsapp-" + req.params.project_id;
+  console.log("\CONTENT_KEY: ", CONTENT_KEY);
 
   let settings = await db.get(CONTENT_KEY);
 
@@ -666,17 +686,25 @@ router.get("/webhook/:project_id", async (req, res) => {
   } else {
     let VERIFY_TOKEN = settings.verify_token;
 
+    console.log("token: ", token);
+    console.log("verify token: ", VERIFY_TOKEN);
+
     // Check if a token and mode were sent
     if (mode && token) {
       // Check the mode and token sent are correct
       if (mode === "subscribe" && token === VERIFY_TOKEN) {
+
         // Respond with 200 OK and challenge token from the request
         console.log("WEBHOOK_VERIFIED");
         res.status(200).send(challenge);
       } else {
         // Responds with '403 Forbidden' if verify tokens do not match
+        console.error("mode is not 'subscribe' or token do not match");
         res.sendStatus(403);
       }
+    } else {
+      console.error("mode or token undefined");
+      res.status(400).send("impossible to verify the webhook: mode or token undefined.")
     }
 
   }
@@ -729,7 +757,7 @@ function startApp(settings, callback) {
 
   db.connect(settings.MONGODB_URL, () => {
     console.log("KVBaseMongo successfully connected.");
-    
+
     if (callback) {
       callback();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-whatsapp-connector",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "Tiledesk Whatsapp connector",
   "main": "index.js",
   "scripts": {

package/template/detail.html

@@ -158,7 +158,7 @@
 
 
     <div>
-      <h7>Receive Whatsapp bot conversations in your Tiledesk dashboard. Seamlessly Chat with your targeted audience on Whatsapp right from the Tiledesk dashboard.</h7>
+      <h7>Receive Whatsapp conversations in your Tiledesk dashboard. Seamlessly Chat with your targeted audience on Whatsapp right from the Tiledesk dashboard.</h7>
 
       <ul style="margin-top: 10px; padding: 0px;">
         <div class="list-element">

package/tiledesk/TiledeskSubscriptionClient.js

@@ -8,7 +8,6 @@ class TiledeskSubscriptionClient {
    * @example
    * const { TiledeskSubscriptionClient } = require('tiledesk-subscription-client');
    * const tdClient = new TiledeskSubscriptionClient({API_URL: tiledeskApiUrl, token: jwt_token, log: log});
-   * 
    * @param {Object} config JSON configuration.
    * @param {string} config.API_URL Mandatory. The Tiledesk api url.
    * @param {string} config.token Optional. Token required for authentication.

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -73,17 +73,17 @@ const path = require('path');
       if ((tiledeskChannelMessage.metadata.type && tiledeskChannelMessage.metadata.type.startsWith('image')) || tiledeskChannelMessage.type.startsWith('image')) {
 
         var imgUrl = tiledeskChannelMessage.metadata.src;
-          whatsapp_message.type = 'image'
-          whatsapp_message.image = {
-            link: imgUrl,
-            caption: text
-          }
-        
+        whatsapp_message.type = 'image'
+        whatsapp_message.image = {
+          link: imgUrl,
+          caption: text
+        }
+
       }
 
-      
 
-      else if ((tiledeskChannelMessage.metadata.type && tiledeskChannelMessage.metadata.type.startsWith('video')) ||     tiledeskChannelMessage.type.startsWith('video')) {
+
+      else if ((tiledeskChannelMessage.metadata.type && tiledeskChannelMessage.metadata.type.startsWith('video')) || tiledeskChannelMessage.type.startsWith('video')) {
         //if (tiledeskChannelMessage.metadata.type.startsWith('video/')) {
         var videoUrl = tiledeskChannelMessage.metadata.src;
         whatsapp_message.type = 'video'