@tiledesk/tiledesk-tybot-connector 0.2.131-rc5 → 0.2.131

package/tiledeskChatbotPlugs/directives/DirReply.js

@@ -2,7 +2,6 @@ const { Filler } = require('../Filler');
 const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
 const { TiledeskChatbotUtil } = require('../../models/TiledeskChatbotUtil');
 let axios = require('axios');
-const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 
 class DirReply {
 
@@ -16,15 +15,6 @@ class DirReply {
     this.token = context.token;
     this.tdcache = context.tdcache;
     this.log = context.log;
-
-    this.API_ENDPOINT = context.API_ENDPOINT;
-    this.tdClient = new TiledeskClient({
-      projectId: this.context.projectId,
-      token: this.context.token,
-      APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
-    });
   }
 
   execute(directive, callback) {
@@ -140,7 +130,7 @@ class DirReply {
     if (this.log) {console.log("Reply:", JSON.stringify(cleanMessage))};
     await TiledeskChatbotUtil.updateConversationTranscript(this.context.chatbot, cleanMessage);
     // console.log("sending message!", cleanMessage);
-    this.tdClient.sendSupportMessage(
+    this.context.tdclient.sendSupportMessage(
       this.requestId,
       cleanMessage,
       (err) => {

package/tiledeskChatbotPlugs/directives/DirReplyV2.js

@@ -6,7 +6,6 @@ const { DirIntent } = require("./DirIntent");
 // const { defaultOptions } = require('liquidjs');
 const { DirMessageToBot } = require('./DirMessageToBot');
 const { v4: uuidv4 } = require('uuid');
-const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 
 class DirReplyV2 {
 
@@ -24,15 +23,6 @@ class DirReplyV2 {
     this.chatbot = context.chatbot;
     this.reply = context.reply;
     this.originalMessage = context.message;
-
-    this.API_ENDPOINT = context.API_ENDPOINT;
-    this.tdClient = new TiledeskClient({
-      projectId: this.context.projectId,
-      token: this.context.token,
-      APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
-    });
   }
 
   execute(directive, callback) {
@@ -273,7 +263,7 @@ class DirReplyV2 {
     cleanMessage.senderFullname = this.context.chatbot.bot.name;
     if (this.log) {console.log("Reply:", JSON.stringify(cleanMessage))};
     await TiledeskChatbotUtil.updateConversationTranscript(this.context.chatbot, cleanMessage);
-    this.tdClient.sendSupportMessage(
+    this.context.tdclient.sendSupportMessage(
       this.requestId,
       cleanMessage,
       (err) => {

package/tiledeskChatbotPlugs/directives/DirSendEmail.js

@@ -2,7 +2,6 @@ const { param } = require('express/lib/request');
 const ms = require('minimist-string');
 const { TiledeskChatbot } = require('../../models/TiledeskChatbot');
 const { Filler } = require('../Filler');
-const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 // const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 
 class DirSendEmail {
@@ -12,18 +11,29 @@ class DirSendEmail {
       throw new Error('context object is mandatory.');
     }
     this.context = context;
+    this.tdclient = context.tdclient;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
-    this.log = context.log;    
-
-    this.API_ENDPOINT = context.API_ENDPOINT;
-    this.tdClient = new TiledeskClient({
-      projectId: this.context.projectId,
-      token: this.context.token,
-      APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
-    });
+    this.log = context.log;
+    // let context =  {
+    //   projectId: projectId,
+    //   token: token,
+    //   supportRequest: supportRequest,
+    //   requestId: supportRequest.request_id,
+    //   TILEDESK_APIURL: API_URL,
+    //   TILEBOT_ENDPOINT:TILEBOT_ENDPOINT,
+    //   departmentId: depId,
+    //   tdcache: tdcache,
+    //   log: false
+    // }
+    // this.tdclient = new TiledeskClient({
+    //   projectId: context.projectId,
+    //   token: context.token,
+    //   APIURL: context.TILEDESK_APIURL,
+    //   APIKEY: "___",
+    //   log: context.log
+    // });
+    
   }
 
   execute(directive, callback) {
@@ -73,7 +83,7 @@ class DirSendEmail {
             replyto: reply_to
           }
           // console.log("email message:", JSON.stringify(message));
-          const message_echo = await this.tdClient.sendEmail(message);
+          const message_echo = await this.tdclient.sendEmail(message);
           if (this.log) {console.log("email sent. filled_subject:", filled_subject);}
           if (this.log) {console.log("email sent. filled_text:", filled_text);}
           if (this.log) {console.log("email sent. filled_to:", filled_to);}

package/tiledeskChatbotPlugs/directives/DirSendWhatsapp.js

@@ -16,7 +16,6 @@ class DirSendWhatsapp {
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
     this.intentDir = new DirIntent(context);
-    this.API_ENDPOINT = this.context.API_ENDPOINT;
     this.log = context.log;
   }
 
@@ -74,11 +73,12 @@ class DirSendWhatsapp {
     payload.broadcast = false;
     
     const whatsapp_api_url_pre = process.env.WHATSAPP_ENDPOINT;
+    const server_base_url = process.env.API_URL || process.env.API_ENDPOINT;
 
     if (whatsapp_api_url_pre) {
       whatsapp_api_url = whatsapp_api_url_pre;
     } else {
-      whatsapp_api_url = this.API_ENDPOINT + "/modules/whatsapp/api"
+      whatsapp_api_url = server_base_url + "/modules/whatsapp/api"
     }
     if (this.log) { console.log("DirSendWhatsapp whatsapp_api_url: ", whatsapp_api_url); };
 

package/tiledeskChatbotPlugs/directives/DirSetConversationTags.js

@@ -1,4 +1,3 @@
-const { TiledeskClient } = require('@tiledesk/tiledesk-client');
 const { Filler } = require('../Filler');
 
 class DirSetConversationTags {
@@ -9,16 +8,8 @@ class DirSetConversationTags {
     }
     this.context = context;
     this.log = context.log;
+    this.tdclient = context.tdclient;
     this.requestId = context.requestId;
-
-    this.API_ENDPOINT = context.API_ENDPOINT;
-    this.tdClient = new TiledeskClient({
-      projectId: this.context.projectId,
-      token: this.context.token,
-      APIURL: this.API_ENDPOINT,
-      APIKEY: "___",
-      log: this.log
-    });
   }
 
   execute(directive, callback) {
@@ -81,7 +72,7 @@ class DirSetConversationTags {
               subtype: "info"
             }
           }
-          this.tdClient.sendSupportMessage(
+          this.tdclient.sendSupportMessage(
             this.requestId,
             message, (err) => {
               if (err) {
@@ -100,7 +91,7 @@ class DirSetConversationTags {
   }
 
   moveToDepartment(requestId, depName, callback) {
-    this.tdClient.getAllDepartments((err, deps) => {
+    this.tdclient.getAllDepartments((err, deps) => {
       if (this.log) {console.log("deps:", JSON.stringify(deps));}
       if (err) {
         console.error("getAllDepartments() error:", err);
@@ -117,7 +108,7 @@ class DirSetConversationTags {
         }
       }
       if (dep) {
-        this.tdClient.updateRequestDepartment(requestId, dep._id, null, (err, res) => {
+        this.tdclient.updateRequestDepartment(requestId, dep._id, null, (err, res) => {
           if (err) {
             console.error("DirDepartment error:", err);
             callback();

package/tiledeskChatbotPlugs/directives/DirWait.js

@@ -8,6 +8,7 @@ class DirWait {
       throw new Error('context object is mandatory.');
     }
     this.context = context;
+    this.tdclient = context.tdclient;
     this.chatbot = context.chatbot;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;

package/tiledeskChatbotPlugs/directives/DirWebRequest.js

@@ -10,6 +10,7 @@ class DirWebRequest {
       throw new Error('context object is mandatory.');
     }
     this.context = context;
+    this.tdclient = context.tdclient;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
     this.log = context.log;

package/tiledeskChatbotPlugs/directives/DirWebRequestV2.js

@@ -10,6 +10,7 @@ class DirWebRequestV2 {
       throw new Error('context object is mandatory.');
     }
     this.context = context;
+    this.tdclient = context.tdclient;
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
     this.intentDir = new DirIntent(context);

package/tiledeskChatbotPlugs/directives/DirWhatsappByAttribute.js

@@ -10,7 +10,6 @@ class DirWhatsappByAttribute {
       throw new Error('context object is mandatory');
     }
     this.context = context;
-    this.API_ENDPOINT = context.API_ENDPOINT;
     this.log = context.log;
   }
 
@@ -36,12 +35,15 @@ class DirWhatsappByAttribute {
       console.log("whatsapp by attributes action: ", JSON.stringify(action))
     }
 
+    /////////// 
+
     const whatsapp_api_url_pre = process.env.WHATSAPP_ENDPOINT;
+    const server_base_url = process.env.API_URL || process.env.API_ENDPOINT;
 
     if (whatsapp_api_url_pre) {
       whatsapp_api_url = whatsapp_api_url_pre;
     } else {
-      whatsapp_api_url = this.API_ENDPOINT + "/modules/whatsapp/api"
+      whatsapp_api_url = server_base_url + "/modules/whatsapp/api"
     }
     console.log("DirWhatsappByAttribute whatsapp_api_url: ", whatsapp_api_url);
 
@@ -92,6 +94,62 @@ class DirWhatsappByAttribute {
         }, true);
     })
 
+
+    // if (process.env.API_URL) {
+    //   whatsapp_api_url = "https://tiledesk-whatsapp-connector.giovannitroisi3.repl.co/api";
+    //   // whatsapp_api_url = process.env.API_URL + "/modules/whatsapp";
+    //   console.log("(Tilebot) DirWhatsappByAttribute whatsapp_api_url: ", whatsapp_api_url);
+    // } else {
+    //   console.error("(Tilebot) ERROR Missing whatsapp_api_url. Unable to use action WhatsApp By Attributes");
+    //   callback();
+    //   return;
+    // }
+    // if (action.attributeName) {
+    //   if (this.log) { console.log("whatsapp attributeName:", action.attributeName); }
+    //   let attribute_value = null;
+    //   if (this.context.tdcache) {
+
+    //     const attribute_value = await TiledeskChatbot.getParameterStatic(this.context.tdcache, this.context.requestId, action.attributeName)
+    //     if (this.log) { console.log("attribute_value:", JSON.stringify(attribute_value)); }
+
+    //     if (attribute_value == null) {
+    //       console.error("(Tilebot) attribute_value is undefined");
+    //       callback();
+    //       return;
+    //     }
+
+    //     const URL = whatsapp_api_url + '/tiledesk/broadcast';
+    //     const HTTPREQUEST = {
+    //       url: URL,
+    //       headers: {
+    //         'Content-Type': 'application/json',
+            
+    //       },
+    //       json: attribute_value,
+    //       method: 'POST'
+    //     };
+    //     let promise = new Promise((resolve, reject) => {
+    //       DirWhatsappByAttribute.myrequest(
+    //         HTTPREQUEST,
+    //         function (err, resbody) {
+    //           if (err) {
+    //             if (callback) {
+    //               callback(err);
+    //             }
+    //             reject(err);
+    //           }
+    //           else {
+    //             if (callback) {
+    //               callback(null, resbody);
+    //             }
+    //             console.log("(tybot) broadcast sent: ", resbody);
+    //             resolve(resbody);
+    //           }
+    //         }, true);
+    //     })
+    //     return promise;
+    //   }
+    // }
   }
 
   // HTTP REQUEST