@tiledesk/tiledesk-whatsapp-connector 0.1.46 → 0.1.48

package/index.js

@@ -122,7 +122,7 @@ router.post('/install', async (req, res) => {
 
   const appClient = new TiledeskAppsClient({ APPS_API_URL: APPS_API_URL });
   appClient.install(installation_info).then((installation) => {
-    winston.debug("(wab) installation response: " + installation);
+    winston.debug("(wab) installation response: ", installation);
 
     res.redirect(url.format({
       pathname: "/detail",
@@ -150,7 +150,7 @@ router.post('/uninstall', async (req, res) => {
   const appClient = new TiledeskAppsClient({ APPS_API_URL: APPS_API_URL });
   appClient.uninstall(project_id, app_id).then((response) => {
 
-    winston.debug("(wab) uninstallation response: " + response);
+    winston.debug("(wab) uninstallation response: ", response);
 
     res.redirect(url.format({
       pathname: "/detail",
@@ -194,7 +194,7 @@ router.get('/configure', async (req, res) => {
     let CONTENT_KEY = "whatsapp-" + project_id;
 
     let settings = await db.get(CONTENT_KEY);
-    winston.debug("(wab) settings: " + settings);
+    winston.debug("(wab) settings: ", settings);
 
     // get departments
     const tdChannel = new TiledeskChannel({ settings: { project_id: project_id, token: token }, API_URL: API_URL })
@@ -314,7 +314,7 @@ router.post('/update', async (req, res) => {
     // promise
     tdClient.subscribe(subscription_info).then((data) => {
       let subscription = data;
-      winston.debug("\n(wab) Subscription: " + subscription)
+      winston.debug("\n(wab) Subscription: ", subscription)
 
       let settings = {
         project_id: project_id,
@@ -434,7 +434,7 @@ router.get('/direct/tiledesk', async (req, res) => {
     text: "Ciao, benvenuto sull'ambiente di sviluppo di Tiledesk! Questo messaggio serve ad aprire una nuova conversazione. Ha funzionato?"
   } 
   */
-  
+
   let tiledeskChannelMessage = {
     text: "Sample text",
     attributes: {
@@ -456,16 +456,16 @@ router.get('/direct/tiledesk', async (req, res) => {
   twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
     winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
   }).catch((err) => {
-    return res.status(400).send({success: false, error: err});
-    winston.error("(wab) error send message: " + err);
+    winston.error("(wab) error send message: ", err);
+    return res.status(400).send({ success: false, error: err });
   })
 
   res.status(200).send("Message sent");
-  
+
 })
 
 router.post('/tiledesk', async (req, res) => {
-  
+
   winston.verbose("(wab) Message received from Tiledesk")
 
   var tiledeskChannelMessage = req.body.payload;
@@ -552,14 +552,14 @@ router.post('/tiledesk', async (req, res) => {
   const messageHandler = new MessageHandler({ tiledeskChannelMessage: tiledeskChannelMessage });
   const tlr = new TiledeskWhatsappTranslator();
 
-  
+
   if (commands) {
     let i = 0;
     async function execute(command) {
       // message
       if (command.type === "message") {
         let tiledeskCommandMessage = await messageHandler.generateMessageObject(command);
-        winston.debug("(wab) message generated from command: " + tiledeskCommandMessage)
+        winston.debug("(wab) message generated from command: ", tiledeskCommandMessage)
 
         let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskCommandMessage, whatsapp_receiver);
         winston.verbose("(wab) whatsappJsonMessage", whatsappJsonMessage)
@@ -575,7 +575,7 @@ router.post('/tiledesk', async (req, res) => {
               winston.debug("(wab) End of commands")
             }
           }).catch((err) => {
-            winston.error("(wab) send message error: " + err);
+            winston.error("(wab) send message error: ", err);
           })
         } else {
           winston.error("(wab) WhatsappJsonMessage is undefined!")
@@ -601,7 +601,7 @@ router.post('/tiledesk', async (req, res) => {
   else if (tiledeskChannelMessage.text || tiledeskChannelMessage.metadata) {
 
     let whatsappJsonMessage = await tlr.toWhatsapp(tiledeskChannelMessage, whatsapp_receiver);
-    winston.verbose("(wab) 🟢 whatsappJsonMessage" + whatsappJsonMessage)
+    winston.verbose("(wab) whatsappJsonMessage", whatsappJsonMessage)
 
     if (whatsappJsonMessage) {
       const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL });
@@ -609,12 +609,12 @@ router.post('/tiledesk', async (req, res) => {
       twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
         winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
       }).catch((err) => {
-        res.status(400).send({success: false, error: "il template non esiste"});
-        winston.error("(wab) error send message: " + err);
+        res.status(400).send({ success: false, error: "il template non esiste" });
+        winston.error("(wab) error send message: ", err);
       })
 
     } else {
-      res.status(400).send({success: false, error: "il template non esiste"});
+      res.status(400).send({ success: false, error: "il template non esiste" });
       winston.error("(wab) Whatsapp Json Message is undefined!")
     }
 
@@ -622,7 +622,7 @@ router.post('/tiledesk', async (req, res) => {
     winston.debug("(wab) no command, no text --> skip")
   }
 
-  return res.send(200);
+  return res.sendStatus(200);
 })
 
 // Endpoint for Whatsapp Business
@@ -653,7 +653,7 @@ router.post("/webhook/:project_id", async (req, res) => {
 
       let CONTENT_KEY = "whatsapp-" + project_id;
       let settings = await db.get(CONTENT_KEY);
-      winston.debug("(wab) settings: " + settings);
+      winston.debug("(wab) settings: ", settings);
 
       if (!settings) {
         winston.verbose("(wab) No settings found. Exit..");
@@ -671,9 +671,9 @@ router.post("/webhook/:project_id", async (req, res) => {
         const bottester = new TiledeskBotTester({ project_id: project_id, redis_client: redis_client, db: db, tdChannel: tdChannel, tlr: tlr });
         bottester.startBotConversation(req.body, code).then((result) => {
           winston.verbose("(wab) test conversation started");
-          winston.debug("(wab) startBotConversation result: " + result);
+          winston.debug("(wab) startBotConversation result: ", result);
         }).catch((err) => {
-          winston.error("(wab) start test onversation error: " + err);
+          winston.error("(wab) start test onversation error: ", err);
         })
 
         // Standard message
@@ -779,7 +779,7 @@ router.post("/webhook/:project_id", async (req, res) => {
           winston.verbose("(wab) tiledeskJsonMessage: ", tiledeskJsonMessage);
           const response = await tdChannel.send(tiledeskJsonMessage, message_info, settings.department_id);
           winston.verbose("(wab) Message sent to Tiledesk!")
-          winston.debug("(wab) response: " + response)
+          winston.debug("(wab) response: ", response)
         } else {
           winston.verbose("(wab) tiledeskJsonMessage is undefined")
         }
@@ -864,7 +864,7 @@ router.post("/newtest", async (req, res) => {
   await redis_client.set(key, JSON.stringify(info), 'EX', 604800);
   redis_client.get(key, (err, value) => {
     if (err) {
-      winston.error("(wab) redis get err: " + err)
+      winston.error("(wab) redis get err: ", err)
       return res.status(500).send({ success: "false", message: "Testing info could not be saved" });
     } else {
       winston.debug("(wab) new test initialized with id: " + short_uid)
@@ -942,6 +942,8 @@ router.get("/templates/:project_id", async (req, res) => {
     let tm = new TemplateManager({ token: settings.wab_token, business_account_id: settings.business_account_id, GRAPH_URL: GRAPH_URL })
     let templates = await tm.getTemplates();
 
+
+
     readHTMLFile('/templates.html', (err, html) => {
       var template = handlebars.compile(html);
       var replacements = {
@@ -970,17 +972,25 @@ router.get("/ext/templates/:project_id", async (req, res) => {
   let settings = await db.get(CONTENT_KEY);
 
   if (settings) {
-    let tm = new TemplateManager({ token: settings.wab_token, business_account_id: settings.business_account_id, GRAPH_URL: GRAPH_URL })
-    let templates = await tm.getTemplates();
 
-    if (templates) {
-      res.status(200).send(templates.data);
+    if (settings.business_account_id) {
+      let tm = new TemplateManager({ token: settings.wab_token, business_account_id: settings.business_account_id, GRAPH_URL: GRAPH_URL })
+      let templates = await tm.getTemplates();
+
+      winston.info("(wab) ext templates: ", templates);
+
+      if (templates) {
+        res.status(200).send(templates.data);
+      } else {
+        res.status(500).send({ success: false, code: '02', message: "A problem occurred while getting templates from WhatsApp" })
+      }
+      
     } else {
-      res.status(500).send({ success: false, code: '02', message: "a problem occurred while getting templates from whatsapp" })
+      res.status(500).send({ success: false, code: '03', message: "Missing parameter 'WhatsApp Business Account ID'. Please update your app."})
     }
 
   } else {
-    res.status(400).send({ success: false, code: '01', message: "whatsapp not installed for the project_id " + project_id })
+    res.status(400).send({ success: false, code: '01', message: "WhatsApp not installed for the project_id " + project_id })
   }
 
 })

package/package.json

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

package/template/configure.html

@@ -25,7 +25,7 @@
         </script>
 
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-    <link rel="stylesheet" href="/css/configure.css">
+    <link rel="stylesheet" href="./css/configure.css">
 
     <style>
       body {

package/template/detail.html

@@ -218,7 +218,7 @@
         <p style="margin-bottom: 0px">Added support for WhatsApp templates</p>
         <!--<p>Bug fixes and performance improvements</p>-->
       </div>
-      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.46</b></p>
+      <p style="font-size: 12px; color: #676767; margin-bottom: 0px;">Version <b>0.1.48</b></p>
     </div>
 
     <div style="width: 100%; display: flex; flex-direction: row; justify-content: space-between; margin-bottom: 15px;">

package/tiledesk/KVBaseMongo.js

@@ -59,7 +59,7 @@ class KVBaseMongo {
       
       this.db.collection(this.KV_COLLECTION).findOne({ key: k }, function(err, doc) {
         if (err) {
-          winston.error("Error reading mongodb value" + err);
+          winston.error("Error reading mongodb value", err);
           reject(err);
         }
         else {

package/tiledesk/MessageHandler.js

@@ -40,7 +40,7 @@ class MessageHandler {
 
   async generateMessageObject(command) {
       
-    winston.debug("(wab) [MessageHandler] command: " + command);
+    winston.debug("(wab) [MessageHandler] command: ", command);
     let tiledeskCommandMessage = command.message;
     tiledeskCommandMessage.recipient = this.tiledeskChannelMessage.recipient;
     

package/tiledesk/TiledeskAppsClient.js

@@ -153,7 +153,7 @@ class TiledeskAppsClient {
         }
       }
     }).catch((err) => {
-      winston.error("(wab) An error occured: " + err);
+      winston.error("(wab) An error occured: ", err);
       if (callback) {
         callback(err, null, null);
       }

package/tiledesk/TiledeskChannel.js

@@ -103,7 +103,7 @@ class TiledeskChannel {
         method: 'GET'
       }).then((response) => {
 
-        winston.debug("(wab) [TiledeskChannel] get request response: " + response.data);
+        winston.debug("(wab) [TiledeskChannel] get request response: ", response.data);
 
         let request_id;
         if (response.data.requests[0]) {
@@ -114,7 +114,7 @@ class TiledeskChannel {
           winston.debug("(wab) [TiledeskChannel] New request_id: " + request_id);
         }
 
-        winston.debug("(wab) [TiledeskChannel] tiledeskMessage:" + tiledeskMessage);
+        winston.debug("(wab) [TiledeskChannel] tiledeskMessage:", tiledeskMessage);
         
         return axios({
           url: this.API_URL + `/${this.settings.project_id}/requests/${request_id}/messages`,
@@ -126,20 +126,20 @@ class TiledeskChannel {
           method: 'POST'
         }).then((response) => {
 
-          winston.debug("(wab) [TiledeskChannel] send message response: " + response.data);
+          winston.debug("(wab) [TiledeskChannel] send message response: ", response.data);
           
           return response.data;
 
         }).catch((err) => {
-          winston.error("(wab) [TiledeskChannel] send message: " + err);
+          winston.error("(wab) [TiledeskChannel] send message: ", err);
         })
       }).catch((err) => {
-        winston.error("(wab) [TiledeskChannel]  get requests: " + err);
+        winston.error("(wab) [TiledeskChannel]  get requests: ", err);
       })
 
 
     }).catch((err) => {
-      winston.error("(wab) [TiledeskChannel] sign in error: " + err);
+      winston.error("(wab) [TiledeskChannel] sign in error: ", err);
     })
   }
 
@@ -154,10 +154,10 @@ class TiledeskChannel {
       },
       method: 'GET'
     }).then((response) => {
-      winston.debug("(wab) [TiledeskChannel] get departments response.data: " + response.data)
+      winston.debug("(wab) [TiledeskChannel] get departments response.data: ", response.data)
       return response.data;
     }).catch((err) => {
-      winston.error("(wab) [TiledeskChannel] get departments error: " + err);
+      winston.error("(wab) [TiledeskChannel] get departments error: ", err);
     })
   }
 
@@ -211,10 +211,10 @@ class TiledeskChannel {
       }).then((response) => {
         return response.data
       }).catch((err) => {
-        winston.error("(wab) [TiledeskChannel] send message (open conversation) error: " + err);
+        winston.error("(wab) [TiledeskChannel] send message (open conversation) error: ", err);
       })
     }).catch((err) => {
-      winston.error("(wab) [TiledeskChannel] sign in error: " + err);
+      winston.error("(wab) [TiledeskChannel] sign in error: ", err);
     })
   }
 
@@ -230,7 +230,7 @@ class TiledeskChannel {
     }).then((response) => {
       return this.checkPlan(response.data);
     }).catch((err) => {
-      winston.error("(wab) [TiledeskChannel] get project detail error: " + err);
+      winston.error("(wab) [TiledeskChannel] get project detail error: ", err);
       return null;
     })
   }

package/tiledesk/TiledeskWhatsapp.js

@@ -107,10 +107,10 @@ class TiledeskWhatsapp {
           })
         })
       }).catch((err) => {
-        winston.error("(wab) [TiledeskWhatsapp] download file error: " + err.data);
+        winston.error("(wab) [TiledeskWhatsapp] download file error: ", err.data);
       })
     }).catch((err) => {
-      winston.error("(wab) [TiledeskWhatsapp] get file error: " + err.data);
+      winston.error("(wab) [TiledeskWhatsapp] get file error: ", err.data);
     })
   }
 
@@ -130,7 +130,7 @@ class TiledeskWhatsapp {
 
     return await axios.post(url, form, request_config).then((response) => {
         
-      winston.debug("(wab) [TiledeskWhatsapp] upload response: " + response.data);
+      winston.debug("(wab) [TiledeskWhatsapp] upload response: ", response.data);
       if (type == "images") {
         let image_url = "https://tiledesk-server-pre.herokuapp.com/images/?path=" + response.data.filename;
         return image_url;
@@ -164,7 +164,7 @@ class TiledeskWhatsapp {
         }
       }
     }).catch((err) => {
-      winston.error("(wab) [TiledeskWhatsapp] An error occured: " + err);
+      winston.error("(wab) [TiledeskWhatsapp] An error occured: ", err);
       if (callback) {
         callback(err, null, null);
       }

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -50,7 +50,7 @@ const path = require('path');
   */
   toWhatsapp(tiledeskChannelMessage, whatsapp_receiver) {
 
-    winston.debug("(wab) [Translator] tiledesk message: " + tiledeskChannelMessage);
+    winston.debug("(wab) [Translator] tiledesk message: ", tiledeskChannelMessage);
 
     let text = '';
     if (tiledeskChannelMessage.text) {
@@ -318,7 +318,7 @@ const path = require('path');
 
   async toTiledesk(whatsappChannelMessage, from, media_url) {
 
-    winston.debug("(wab) [Translator] whatsapp message: " + whatsappChannelMessage);
+    winston.debug("(wab) [Translator] whatsapp message: ", whatsappChannelMessage);
 
     // text message
     if (whatsappChannelMessage.type == 'text') {