@tiledesk/tiledesk-whatsapp-connector 1.0.32 → 1.0.33

package/.env

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

package/index.js

@@ -31,7 +31,7 @@ const { TemplateManager } = require("./tiledesk/TemplateManager");
 const { WhatsappLogger } = require("./tiledesk/WhatsappLogger");
 const Utils = require("./tiledesk/Utils");
 const whatsappService = require("./tiledesk/WhatsappService");
-const { ensureGlobalSigninSubscription, ensureProjectTestSubscription } = require("./tiledesk/BotTestSubscriptions");
+const { ensureGlobalSigninSubscription, ensureProjectTestSubscription, getActiveTest, isProjectId } = require("./tiledesk/BotTestSubscriptions");
 
 // mongo
 const { KVBaseMongo } = require("./tiledesk/KVBaseMongo");
@@ -931,7 +931,7 @@ router.post('/webhook', async (req, res) => {
         winston.verbose("(wab) tiledeskJsonMessage: ", tiledeskJsonMessage);
 
         try {
-          const response = await tdChannel.send(tiledeskJsonMessage, message_info, settings.department_id);
+          const response = await deliverInboundMessage(tdChannel, tiledeskJsonMessage, message_info, settings);
           winston.verbose("(wab) Message sent to Tiledesk!");
           winston.debug("(wab) response: ", response);
         } catch (err) {
@@ -1166,7 +1166,7 @@ router.post("/webhook/:project_id", async (req, res) => {
 
         if (tiledeskJsonMessage) {
           winston.verbose("(wab) tiledeskJsonMessage: ", tiledeskJsonMessage);
-          const response = await tdChannel.send(tiledeskJsonMessage, message_info, settings.department_id);
+          const response = await deliverInboundMessage(tdChannel, tiledeskJsonMessage, message_info, settings);
           winston.verbose("(wab) Message sent to Tiledesk!");
           winston.debug("(wab) response: ", response);
         } else {
@@ -1875,6 +1875,22 @@ async function getDepartments(project_id, token) {
   }
 }
 
+async function deliverInboundMessage(tdChannel, tiledeskJsonMessage, messageInfo, settings) {
+  const whatsapp = messageInfo && messageInfo.whatsapp;
+  const session = await getActiveTest(redis_client, whatsapp && whatsapp.phone_number_id, whatsapp && whatsapp.from);
+  if (session && session.request_id && isProjectId(session.project_id)) {
+    winston.verbose("(wab) Continue Try on WhatsApp in project " + session.project_id);
+    const signinSubscription = await ensureGlobalSigninSubscription(db, BASE_URL);
+    return tdChannel.sendToExistingRequest(tiledeskJsonMessage, messageInfo, {
+      project_id: session.project_id,
+      request_id: session.request_id,
+      subscriptionId: String(signinSubscription._id),
+      secret: signinSubscription.secret
+    });
+  }
+  return tdChannel.send(tiledeskJsonMessage, messageInfo, settings.department_id);
+}
+
 /**
  * Helper function to get or create user token with Redis caching
  * @param {Object} tdChannel - TiledeskChannel instance

package/package.json

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

package/tiledesk/BotTestSubscriptions.js

@@ -95,6 +95,44 @@ async function ensureProjectTestSubscription(kv, projectId, baseUrl, redisClient
   return existing;
 }
 
+function activeTestKey(phoneNumberId, from) {
+  return "bottest:active:" + phoneNumberId + ":" + from;
+}
+
+function saveActiveTest(redisClient, phoneNumberId, from, session) {
+  if (!redisClient || !phoneNumberId || !from || !session) {
+    return Promise.resolve();
+  }
+  const key = activeTestKey(phoneNumberId, from);
+  return new Promise((resolve, reject) => {
+    redisClient.set(key, JSON.stringify(session), "EX", 604800, function (err) {
+      if (err) {
+        return reject(err);
+      }
+      resolve();
+    });
+  });
+}
+
+function getActiveTest(redisClient, phoneNumberId, from) {
+  if (!redisClient || !phoneNumberId || !from) {
+    return Promise.resolve(null);
+  }
+  const key = activeTestKey(phoneNumberId, from);
+  return new Promise((resolve) => {
+    redisClient.get(key, function (err, value) {
+      if (err || !value) {
+        return resolve(null);
+      }
+      try {
+        resolve(JSON.parse(value));
+      } catch (parseErr) {
+        resolve(null);
+      }
+    });
+  });
+}
+
 function invalidateSubscriptionCache(redisClient, projectId, event) {
   if (!redisClient || !projectId || !event) {
     return Promise.resolve();
@@ -120,5 +158,7 @@ module.exports = {
   WHATSAPP_MESSAGE_EVENT,
   isProjectId,
   ensureGlobalSigninSubscription,
-  ensureProjectTestSubscription
+  ensureProjectTestSubscription,
+  saveActiveTest,
+  getActiveTest
 };

package/tiledesk/TiledeskBotTester.js

@@ -7,7 +7,7 @@ const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { TiledeskWhatsappTranslator } = require('./TiledeskWhatsappTranslator');
 const { TiledeskChannel } = require('./TiledeskChannel');
 const Utils = require("./Utils");
-const { ensureGlobalSigninSubscription, ensureProjectTestSubscription, isProjectId } = require("./BotTestSubscriptions");
+const { ensureGlobalSigninSubscription, ensureProjectTestSubscription, isProjectId, saveActiveTest } = require("./BotTestSubscriptions");
 
 class TiledeskBotTester {
 
@@ -123,6 +123,13 @@ class TiledeskBotTester {
                 subscriptionId: String(signinSubscription._id),
                 secret: signinSubscription.secret
               });
+              if (response && response.request_id) {
+                await saveActiveTest(this.redis_client, phoneNumberId, message_info.whatsapp.from, {
+                  project_id: test_info.project_id,
+                  bot_id: test_info.bot_id,
+                  request_id: response.request_id
+                });
+              }
               return resolve(response);
             } catch (prepareErr) {
               winston.error("(wab) [TiledeskBotTester] unable to open test conversation: " + prepareErr);

package/tiledesk/TiledeskChannel.js

@@ -236,7 +236,9 @@ class TiledeskChannel {
         data: tiledeskMessage,
         method: 'POST'
       }).then((response) => {
-        return response.data
+        const data = response.data || {};
+        data.request_id = new_request_id;
+        return data;
       }).catch((err) => {
         const errorMessage = utils._extractErrorMessage(err);
         winston.error("(wab) [TiledeskChannel] send message (open conversation) error: " + errorMessage);
@@ -247,6 +249,49 @@ class TiledeskChannel {
     })
   }
 
+  /**
+   * Append a message to a Try on WhatsApp request that already lives in the bot's project.
+   */
+  async sendToExistingRequest(tiledeskMessage, messageInfo, target) {
+    if (!target || !target.project_id || !target.request_id || !target.subscriptionId || !target.secret) {
+      throw new Error("Try on WhatsApp session is incomplete");
+    }
+
+    const channel = messageInfo.whatsapp || {};
+    const payload = {
+      _id: 'wab-' + channel.from,
+      first_name: channel.firstname,
+      last_name: channel.lastname,
+      sub: 'userexternal',
+      aud: 'https://tiledesk.com/subscriptions/' + target.subscriptionId
+    };
+    const customToken = jwt.sign(payload, target.secret);
+
+    const signinResponse = await axios({
+      url: this.API_URL + "/auth/signinWithCustomToken",
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': 'JWT ' + customToken
+      },
+      data: { id_project: target.project_id },
+      method: 'POST'
+    });
+
+    const token = this.fixToken(signinResponse.data.token);
+    delete tiledeskMessage.participants;
+
+    const sendResponse = await axios({
+      url: this.API_URL + `/${target.project_id}/requests/${target.request_id}/messages`,
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': token
+      },
+      data: tiledeskMessage,
+      method: 'POST'
+    });
+    return sendResponse.data;
+  }
+
   /**
    * Get the project detail from Tiledesk
    * @returns {Promise<Object>} - The response from the Tiledesk API