@tiledesk/tiledesk-whatsapp-connector 0.1.80 → 0.1.82

package/index.js

@@ -212,13 +212,16 @@ router.get("/configure", async (req, res) => {
 
     let settings = await db.get(CONTENT_KEY);
     winston.debug("(wab) settings: ", settings);
+    
+    settings.token = token;
+    await db.set(CONTENT_KEY, settings);
 
     // get departments
     const tdChannel = new TiledeskChannel({
       settings: { project_id: project_id, token: token },
       API_URL: API_URL,
     });
-    let departments = await tdChannel.getDepartments(token);
+    let departments = await tdChannel.getDepartments();
     winston.debug("(wab) found " + departments.length + " departments");
 
     if (settings) {
@@ -232,6 +235,9 @@ router.get("/configure", async (req, res) => {
           wab_token: settings.wab_token,
           verify_token: settings.verify_token,
           business_account_id: settings.business_account_id,
+          phone_number: settings.phone_number,
+          phone_number_id: settings.phone_number_id,
+          verified_name: settings.verified_name,
           subscription_id: settings.subscriptionId,
           department_id: settings.department_id,
           departments: departments,
@@ -281,13 +287,28 @@ router.post("/update", async (req, res) => {
     settings: { project_id: project_id, token: token },
     API_URL: API_URL,
   });
-  let departments = await tdChannel.getDepartments(token);
+  let departments = await tdChannel.getDepartments();
 
   if (settings) {
     settings.wab_token = wab_token;
     settings.verify_token = verify_token;
     settings.department_id = department_id;
     settings.business_account_id = business_account_id;
+    
+    const twClient = new TiledeskWhatsapp({
+      token: settings.wab_token,
+      GRAPH_URL: GRAPH_URL,
+      API_URL: API_URL,
+      BASE_FILE_URL: BASE_FILE_URL,
+    });
+    
+    await twClient.getBusinessAccountInfo(business_account_id).then((info) => {
+      settings.phone_number_id = info.data[0].id;
+      settings.phone_number = info.data[0].display_phone_number;
+      settings.verified_name = info.data[0].verified_name;
+    }).catch((err) => {
+      winston.error("Error getting WAB Account Info");
+    })
 
     await db.set(CONTENT_KEY, settings);
 
@@ -302,6 +323,9 @@ router.post("/update", async (req, res) => {
         show_success_modal: true,
         verify_token: settings.verify_token,
         business_account_id: settings.business_account_id,
+        phone_number: settings.phone_number,
+        phone_number_id: settings.phone_number_id,
+        verified_name: settings.verified_name,
         subscription_id: settings.subscriptionId,
         department_id: settings.department_id,
         departments: departments,
@@ -322,14 +346,7 @@ router.post("/update", async (req, res) => {
       event: "message.create.request.channel.whatsapp",
     };
 
-    /*
-    // callback
-    await tdClient.subscribe(project_id, data, (err, data) => {
-      // code here
-    }) 
-    */
 
-    // promise
     tdClient.subscribe(subscription_info).then((data) => {
       let subscription = data;
       winston.debug("\n(wab) Subscription: ", subscription);
@@ -360,6 +377,9 @@ router.post("/update", async (req, res) => {
           wab_token: settings.wab_token,
           verify_token: settings.verify_token,
           business_account_id: settings.business_account_id,
+          phone_number: settings.phone_number,
+          phone_number_id: settings.phone_number_id,
+          verified_name: settings.verified_name,
           subscription_id: settings.subscriptionId,
           department_id: settings.department_id,
           departments: departments,
@@ -387,6 +407,65 @@ router.post("/update", async (req, res) => {
   }
 });
 
+router.post("/getinfo", async (req, res) => {
+  
+  winston.verbose("/getinfo");
+  let project_id = req.body.project_id;
+  let token = req.body.token;
+  let proxy_url = BASE_URL + "/webhook/" + project_id;
+  
+  let CONTENT_KEY = "whatsapp-" + project_id;
+  let settings = await db.get(CONTENT_KEY);
+  
+  const tdChannel = new TiledeskChannel({
+    settings: { project_id: project_id, token: token },
+    API_URL: API_URL,
+  });
+  let departments = await tdChannel.getDepartments();
+
+  const twClient = new TiledeskWhatsapp({
+      token: settings.wab_token,
+      GRAPH_URL: GRAPH_URL,
+      API_URL: API_URL,
+      BASE_FILE_URL: BASE_FILE_URL,
+  });
+  
+  await twClient.getBusinessAccountInfo(settings.business_account_id).then((info) => {
+    settings.phone_number_id = info.data[0].id;
+    settings.phone_number = info.data[0].display_phone_number;
+    settings.verified_name = info.data[0].verified_name;
+    winston.debug("(wab) Business account info: ", info);
+  }).catch((err) => {
+    winston.error("Error getting WAB Account Info");
+  })
+  
+  await db.set(CONTENT_KEY, settings);
+  
+  readHTMLFile("/configure.html", (err, html) => {
+      var template = handlebars.compile(html);
+      var replacements = {
+        app_version: pjson.version,
+        project_id: project_id,
+        token: token,
+        proxy_url: proxy_url,
+        wab_token: settings.wab_token,
+        show_success_modal: true,
+        verify_token: settings.verify_token,
+        business_account_id: settings.business_account_id,
+        phone_number: settings.phone_number,
+        phone_number_id: settings.phone_number_id,
+        verified_name: settings.verified_name,
+        subscription_id: settings.subscriptionId,
+        department_id: settings.department_id,
+        departments: departments,
+        brand_name: BRAND_NAME
+      };
+      var html = template(replacements);
+      res.send(html);
+    });
+  
+})
+
 router.post("/disconnect", async (req, res) => {
   winston.verbose("(wab) /disconnect");
 
@@ -410,7 +489,7 @@ router.post("/disconnect", async (req, res) => {
     settings: { project_id: project_id, token: token },
     API_URL: API_URL,
   });
-  let departments = await tdChannel.getDepartments(token);
+  let departments = await tdChannel.getDepartments();
 
   /*
   // callback

package/package.json

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

package/routes/api.js

@@ -85,7 +85,6 @@ router.post('/customer/io', async (req, res) => {
   }
 })
 
-
 router.get("/:project_id", async (req, res) => {
   winston.verbose("(wab) /api/project_id");
 

package/template/configure.html

@@ -137,7 +137,7 @@
       <div style="padding: 20px; background-color: #2fa2dc24; border-radius: 8px; width: 600px; margin-bottom: 5px;">
         <div style="display: flex; flex-direction: row; align-items: baseline;">
           <div>
-            <img src="https://freeiconshop.com/wp-content/uploads/edd/arrow-flat.png" width="20px" height="auto" style="margin-right: 10px;"> 
+            <img src="https://cdn-icons-png.freepik.com/256/13077/13077927.png?semt=ais_hybrid" width="20px" height="auto" style="margin-right: 10px;"> 
           </div>
           <div>
             <a href="https://gethelp.tiledesk.com/articles/connect-tiledesk-with-whatsapp-business/" target="_blank">Connect Tiledesk with WhatsApp Business</a>
@@ -149,7 +149,7 @@
       <div style="padding: 20px; background-color: #2fa2dc24; border-radius: 8px; width: 600px; margin-bottom: 5px;">
         <div style="display: flex; flex-direction: row; align-items: baseline;">
           <div>
-            <img src="https://freeiconshop.com/wp-content/uploads/edd/arrow-flat.png" width="20px" height="auto" style="margin-right: 10px;"> 
+            <img src="https://cdn-icons-png.freepik.com/256/13077/13077927.png?semt=ais_hybrid" width="20px" height="auto" style="margin-right: 10px;"> 
           </div>
           <div>
             <a href="https://gethelp.tiledesk.com/articles/configure-a-whatsapp-business-account/" target="_blank">Configure a WhatsApp Business account</a>
@@ -269,8 +269,57 @@
                 <input type="submit" class="btn" style="width: 200px; background-color: #0ba2dc; color: white; font-weight: 500;" value="Connect"
                     onclick="postMessage('connectWhatsapp')">
               </div>
-            {{/if}}
+            {{/if}}    
           </form>
+        
+          <form action="./getinfo" method="post">
+          {{#if wab_token}}
+              {{#if phone_number_id}}
+                <div style="margin-top: 20px;">
+                  <div style="display: flex;">
+                    <p style="margin-right: 10px">Verified Name:</p>
+                    <b>{{ verified_name }}</b>
+                  </div>
+
+                  <div style="display: flex;">
+                    <p style="margin-right: 10px">Phone Number:</p>
+                    <b>{{ phone_number }}</b>
+                  </div>
+
+                  <div style="display: flex;">
+                    <p style="margin-right: 10px">Phone Number ID:</p>
+                    <b>{{ phone_number_id }}</b>
+                  </div>
+                </div>
+        
+                <input type="hidden" name="project_id" value="{{ project_id }}" />
+                <input type="hidden" name="token" value="{{ token }}" />
+                <input type="submit" class="btn" style="width: 80px; background-color: #ffffff; color: #000000; font-weight: 400; border: solid 1px; border-radius: 14px;" value="Refresh">
+              {{else}}
+                  <div style="margin-top: 20px">
+                    <div style="display: flex;">
+                      <p style="margin-right: 10px">Verified Name:</p>
+                      <b>Unknown</b>
+                    </div>
+
+                    <div style="display: flex;">
+                      <p style="margin-right: 10px">Phone Number:</p>
+                      <b>Unknown</b>
+                    </div>
+
+                    <div style="display: flex;">
+                      <p style="margin-right: 10px">Phone Number ID:</p>
+                      <b>Unknown</b>
+                    </div>
+                  </div>  
+                  
+                  <input type="hidden" name="project_id" value="{{ project_id }}" />
+                  <input type="hidden" name="token" value="{{ token }}" />
+                  <input type="submit" class="btn" style="width: 80px; background-color: #ffffff; color: #000000; font-weight: 400; border: solid 1px; border-radius: 14px;" value="Refresh">
+                  <p style="margin-top: 6px; margin-bottom: 0px; color: #a3a3a3; max-width: 430px; font-weight: 300;">Click on Refresh to retrieve your Whatsapp Business Account informations and automatically set your <b>Phone Number ID</b>.</p>
+              {{/if}}
+            {{/if}}
+            </form>
         </div> 
 
       

package/template/css/configure1.css

@@ -0,0 +1,50 @@
+body {
+    font-family: Arial, sans-serif;
+    background-color: #f8f9fa;
+    margin: 0;
+    padding: 0;
+}
+
+.container {
+    margin-top: 50px;
+}
+
+h2 {
+    text-align: center;
+    color: #343a40;
+}
+
+.btn-primary {
+    display: block;
+    width: 200px;
+    margin: 20px auto;
+    background-color: #007bff;
+    border-color: #007bff;
+}
+
+.btn-primary:hover {
+    background-color: #0056b3;
+    border-color: #004085;
+}
+
+.modal-content {
+    border-radius: 10px;
+}
+
+.modal-header {
+    background-color: #007bff;
+    color: white;
+    border-bottom: none;
+}
+
+.modal-footer {
+    border-top: none;
+}
+
+.close {
+    color: white;
+}
+
+.close:hover {
+    color: #d6d8db;
+}

package/tiledesk/TiledeskChannel.js

@@ -75,7 +75,6 @@ class TiledeskChannel {
       _id: 'wab-' + channel.from,
       first_name: channel.firstname,
       last_name: channel.lastname,
-      email: 'na@whatsapp.com',
       sub: 'userexternal',
       aud: 'https://tiledesk.com/subscriptions/' + this.settings.subscriptionId
     }
@@ -158,7 +157,7 @@ class TiledeskChannel {
       winston.debug("(wab) [TiledeskChannel] get departments response.data: ", response.data)
       return response.data;
     }).catch((err) => {
-      winston.error("(wab) [TiledeskChannel] get departments error");
+      winston.error("(wab) [TiledeskChannel] get departments error: ", err.response.data);
     })
   }
 
@@ -183,7 +182,6 @@ class TiledeskChannel {
       _id: 'wab-' + channel.from,
       first_name: channel.firstname,
       last_name: channel.lastname,
-      email: 'na@whatsapp.com',
       sub: 'userexternal',
       aud: 'https://tiledesk.com/subscriptions/' + this.settings.subscriptionId
     }

package/tiledesk/TiledeskWhatsapp.js

@@ -71,6 +71,25 @@ class TiledeskWhatsapp {
       throw err;
     })
   }
+  
+  async getBusinessAccountInfo(business_account_id) {
+    
+    winston.debug("(wab) [TiledeskWhatsapp] Getting business account info...");
+    
+    return await axios({
+      url: this.GRAPH_URL + business_account_id + "/phone_numbers?access_token=" + this.token,
+      headers: {
+        "Content-Type": "application/json"
+      },
+      method: "GET"
+    }).then((response) => {
+      winston.debug("(wab) [TiledeskWhatsapp] Business account info response ", response);
+      return response.data;
+    }).catch((err) => {
+      winston.error("(wab) [TiledeskWhatsapp] Gettings account info error ", err);
+      throw err;
+    })
+  }
 
   async downloadMedia(mediaId) {
     
@@ -157,7 +176,7 @@ class TiledeskWhatsapp {
 
     })
   }
-
+  
 
   // HTTP REQUEST
   static async myrequest(options, callback, log) {

package/tiledesk/TiledeskWhatsappTranslator.js

@@ -263,10 +263,12 @@ const path = require('path');
 
           if (buttons_count > 10) {
             // too many buttons
-            // Option 1: Skip message (current)
+            // Option 1: Skip message
             // Option 2: Cut buttons array -> display first 10 buttons only
-            // Option 3: Send message with *buttons
+            // Option 3: Send message with *buttons (current)
 
+            // Warning: NOT WORKING PROPERLY
+            // _raw_message is undefined due to last changes on tiledesk-chatbot
             whatsapp_message.text = { body: tiledeskChannelMessage.attributes._raw_message };
             return null;
           }