@tiledesk/tiledesk-whatsapp-connector 1.0.18 → 1.0.20

package/.env

@@ -0,0 +1,2 @@
+# CUSTOM ENV
+NPM_PUBLISH_TOKEN=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

package/index.js

@@ -57,7 +57,6 @@ let APPS_API_URL = null;
 let REDIS_HOST = null;
 let REDIS_PORT = null;
 let REDIS_PASSWORD = null;
-let BASE_FILE_URL = null;
 let AMQP_MANAGER_URL = null;
 let JOB_TOPIC_EXCHANGE = null;
 let BRAND_NAME = null;
@@ -348,8 +347,7 @@ router.post("/update", async (req, res) => {
     const twClient = new TiledeskWhatsapp({
       token: settings.wab_token,
       GRAPH_URL: GRAPH_URL,
-      API_URL: API_URL,
-      BASE_FILE_URL: BASE_FILE_URL,
+      API_URL: API_URL
     });
 
     await twClient.getBusinessAccountInfo(business_account_id).then((info) => {
@@ -477,8 +475,7 @@ router.post("/getinfo", async (req, res) => {
   const twClient = new TiledeskWhatsapp({
     token: settings.wab_token,
     GRAPH_URL: GRAPH_URL,
-    API_URL: API_URL,
-    BASE_FILE_URL: BASE_FILE_URL,
+    API_URL: API_URL
   });
 
   await twClient.getBusinessAccountInfo(settings.business_account_id).then((info) => {
@@ -687,8 +684,7 @@ router.post("/tiledesk", async (req, res) => {
           const twClient = new TiledeskWhatsapp({
             token: settings.wab_token,
             GRAPH_URL: GRAPH_URL,
-            API_URL: API_URL,
-            BASE_FILE_URL: BASE_FILE_URL,
+            API_URL: API_URL
           });
           twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
             winston.verbose(
@@ -739,8 +735,7 @@ router.post("/tiledesk", async (req, res) => {
       const twClient = new TiledeskWhatsapp({
         token: wab_token,
         GRAPH_URL: GRAPH_URL,
-        API_URL: API_URL,
-        BASE_FILE_URL: BASE_FILE_URL,
+        API_URL: API_URL
       });
 
       twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
@@ -851,8 +846,7 @@ router.post('/webhook', async (req, res) => {
         const util = new TiledeskWhatsapp({
           token: settings.wab_token,
           GRAPH_URL: GRAPH_URL,
-          API_URL: API_URL,
-          BASE_FILE_URL: BASE_FILE_URL,
+          API_URL: API_URL
         });
 
         const media = whatsappChannelMessage[whatsappChannelMessage.type];
@@ -864,8 +858,7 @@ router.post('/webhook', async (req, res) => {
         }
 
         const file_path = path.join(__dirname, "tmp", filename);
-        const uploadFolder = whatsappChannelMessage.type === "image" ? "images" : "files";
-        const media_url = await util.uploadMedia(file_path, uploadFolder);
+        const media_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
         winston.debug(`(wab) media_url: ${media_url}`);
 
         tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
@@ -1027,8 +1020,7 @@ router.post("/webhook/:project_id", async (req, res) => {
           const util = new TiledeskWhatsapp({
             token: settings.wab_token,
             GRAPH_URL: GRAPH_URL,
-            API_URL: API_URL,
-            BASE_FILE_URL: BASE_FILE_URL,
+            API_URL: API_URL
           });
 
           if (whatsappChannelMessage.type == "image") {
@@ -1040,7 +1032,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
 
             let file_path = path.join(__dirname, "tmp", filename);
-            const image_url = await util.uploadMedia(file_path, "images");
+            const image_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
             winston.debug("(wab) image_url: " + image_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, image_url);
@@ -1056,7 +1048,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
             let file_path = path.join(__dirname, "tmp", filename);
 
-            const media_url = await util.uploadMedia(file_path, "files");
+            const media_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
             winston.debug("(wab) media_url: " + media_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
@@ -1072,7 +1064,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
             let file_path = path.join(__dirname, "tmp", filename);
 
-            const media_url = await util.uploadMedia(file_path, "files");
+            const media_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
             winston.debug("(wab) media_url: " + media_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
@@ -1088,7 +1080,7 @@ router.post("/webhook/:project_id", async (req, res) => {
             }
             let file_path = path.join(__dirname, "tmp", filename);
 
-            const media_url = await util.uploadMedia(file_path, "files");
+            const media_url = await util.uploadMedia(file_path, settings.project_id, settings.token);
             winston.debug("(wab) media_url: " + media_url);
 
             tiledeskJsonMessage = await tlr.toTiledesk(whatsappChannelMessage, firstname, media_url);
@@ -1482,8 +1474,7 @@ router.get("/direct/tiledesk", async (req, res) => {
   const twClient = new TiledeskWhatsapp({
     token: settings.wab_token,
     GRAPH_URL: GRAPH_URL,
-    API_URL: API_URL,
-    BASE_FILE_URL: BASE_FILE_URL,
+    API_URL: API_URL
   });
 
   let whatsappJsonMessage = await tlr.toWhatsapp(
@@ -1538,8 +1529,7 @@ router.post("/tiledesk/broadcast", async (req, res) => {
   const twClient = new TiledeskWhatsapp({
     token: settings.wab_token,
     GRAPH_URL: GRAPH_URL,
-    API_URL: API_URL,
-    BASE_FILE_URL: BASE_FILE_URL,
+    API_URL: API_URL
   });
 
   let response = await tm.getTemplates();
@@ -1619,14 +1609,6 @@ async function startApp(settings, callback) {
     winston.info("(wab) API_URL: " + API_URL);
   }
 
-  if (!settings.BASE_FILE_URL) {
-    winston.error("(wab) BASE_FILE_URL is mandatory. Exit...");
-    return callback("Missing parameter: BASE_FILE_URL");
-  } else {
-    BASE_FILE_URL = settings.BASE_FILE_URL;
-    winston.info("(wab) BASE_FILE_URL: " + BASE_FILE_URL);
-  }
-
   if (!settings.BASE_URL) {
     winston.error("(wab) BASE_URL is mandatory. Exit...");
     return callback("Missing parameter: BASE_URL");
@@ -1743,7 +1725,6 @@ async function startApp(settings, callback) {
       DB: db,
       API_URL: API_URL,
       GRAPH_URL: GRAPH_URL,
-      BASE_FILE_URL: BASE_FILE_URL,
       AMQP_MANAGER_URL: AMQP_MANAGER_URL,
       JOB_TOPIC_EXCHANGE: JOB_TOPIC_EXCHANGE,
     },

package/package.json

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

package/routes/api.js

@@ -15,7 +15,6 @@ const Utils = require('../tiledesk/Utils');
 let db = null;
 let API_URL = null;
 let GRAPH_URL = null;
-let BASE_FILE_URL = null;
 let AMQP_MANAGER_URL = null;
 let JOB_TOPIC_EXCHANGE = null;
 let utils = null;
@@ -77,7 +76,11 @@ router.post('/customer/io', async (req, res) => {
   winston.debug("[ CUSTOMER.IO ] whatsappJsonMessage: ", JSON.stringify(whatsappJsonMessage, null, 2));
 
   if (whatsappJsonMessage) {
-    const twClient = new TiledeskWhatsapp({ token: settings.wab_token, GRAPH_URL: GRAPH_URL, API_URL: API_URL, BASE_FILE_URL: BASE_FILE_URL });
+    const twClient = new TiledeskWhatsapp({ 
+      token: settings.wab_token, 
+      GRAPH_URL: GRAPH_URL, 
+      API_URL: API_URL
+    });
 
     twClient.sendMessage(phone_number_id, whatsappJsonMessage).then((response) => {
         winston.verbose("(wab) Message sent to WhatsApp! " + response.status + " " + response.statusText);
@@ -294,13 +297,6 @@ async function startRoute(settings, callback) {
     winston.info("(wab api) API_URL: " + API_URL);
   }
 
-  if (!settings.BASE_FILE_URL) {
-    winston.error("(wab api) BASE_FILE_URL is mandatory. Exit...");
-    return callback('Missing parameter: BASE_FILE_URL');
-  } else {
-    BASE_FILE_URL = settings.BASE_FILE_URL;
-    winston.info("(wab api) BASE_FILE_URL: " + BASE_FILE_URL);
-  }
 
   if (!settings.AMQP_MANAGER_URL) {
     winston.error("(wab api) AMQP_MANAGER_URL is mandatory (?). Exit...");

package/tiledesk/TiledeskWhatsapp.js

@@ -36,15 +36,11 @@ class TiledeskWhatsapp {
       throw new Error('config.API_URL is mandatory');
     }
 
-    if (!config.BASE_FILE_URL) {
-      throw new Error('config.BASE_FILE_URL is mandatory')
-    }
-
     // this.media = config.channelMedia;
     this.token = config.token;
     this.GRAPH_URL = config.GRAPH_URL
     this.api_url = config.API_URL;
-    this.base_file_url = config.BASE_FILE_URL;
+
 
     this.log = false;
     if (config.log) {
@@ -147,8 +143,8 @@ class TiledeskWhatsapp {
     })
   }
 
-  async uploadMedia(path, type) {
-    let url = this.base_file_url + "/" + type + "/public/";
+  async uploadMedia(path, id_project, token) {
+    let url = `${this.api_url}/${id_project}/files/chat`;
     winston.debug("(wab) [TiledeskWhatsapp] Uploading file...");
 
     const form = new FormData();
@@ -157,22 +153,16 @@ class TiledeskWhatsapp {
       maxContentLength: Infinity,
       maxBodyLength: Infinity,
       header: {
-        ...form.getHeaders()
+        ...form.getHeaders(),
+        'Authorization': token
       }
     }
 
     return await axios.post(url, form, request_config).then((response) => {
         
       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;
-        let image_url = this.base_file_url + "/images/?path=" + response.data.filename;
-        return image_url;
-      } else {
-        //let file_url = "https://tiledesk-server-pre.herokuapp.com/files/download?path=" + response.data.filename;
-        let file_url = this.base_file_url + "/files/download?path=" + response.data.filename;
-        return file_url;
-      }
+      let file_url = this.api_url + "/files/download?path=" + response.data.filename;
+      return file_url;
 
     }).catch((err) => {
       if (err.response?.status === 413) {