@tiledesk/tiledesk-tybot-connector 0.2.131-rc1 → 0.2.131-rc2

package/CHANGELOG.md

@@ -17,6 +17,9 @@ available on:
 - Added flowError on JSONCondition when result = null
 - Added fix on Filler -->
 
+# v0.2.131-rc2
+- changed API_URL with API_ENDPOINT
+
 # v0.2.131-rc1
 - added: AUDIO_RECORD vxml action as reply_v2 actionType
 - added: DirAddTags action

package/index.js

@@ -30,7 +30,7 @@ const { DirectivesChatbotPlug } = require('./tiledeskChatbotPlugs/DirectivesChat
 let mongoose = require('mongoose');
 // const { Directives } = require('./tiledeskChatbotPlugs/directives/Directives.js');
 const { TiledeskChatbotUtil } = require('./models/TiledeskChatbotUtil.js'); //require('@tiledesk/tiledesk-chatbot-util');
-let APIURL = null;
+let API_ENDPOINT = null;
 let staticBots;
 
 router.post('/ext/:botid', async (req, res) => {
@@ -160,7 +160,7 @@ router.post('/ext/:botid', async (req, res) => {
     botId: botId,
     bot: bot,
     token: token,
-    APIURL: APIURL,
+    APIURL: API_ENDPOINT,
     APIKEY: "___",
     tdcache: tdcache,
     requestId: requestId,
@@ -206,7 +206,7 @@ router.post('/ext/:botid', async (req, res) => {
           directives: directives,
           chatbot: chatbot,
           supportRequest: message.request,
-          TILEDESK_API_ENDPOINT: APIURL,
+          API_ENDPOINT: API_ENDPOINT,
           TILEBOT_ENDPOINT:process.env.TYBOT_ENDPOINT,
           token: token,
           log: log,
@@ -232,7 +232,7 @@ router.post('/ext/:botid', async (req, res) => {
     reply.attributes.splits = true;
     reply.attributes.markbot = true;
     reply.attributes.fillParams = true;
-    let extEndpoint = `${APIURL}/modules/tilebot/`;
+    let extEndpoint = `${API_ENDPOINT}/modules/tilebot/`;
     if (process.env.TYBOT_ENDPOINT) {
       extEndpoint = `${process.env.TYBOT_ENDPOINT}`;
     }
@@ -264,7 +264,7 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   const tdclient = new TiledeskClient({
     projectId: projectId,
     token: token,
-    APIURL: APIURL,
+    APIURL: API_ENDPOINT,
     APIKEY: "___",
     log: false
   });
@@ -309,10 +309,10 @@ router.post('/ext/:projectId/requests/:requestId/messages', async (req, res) =>
   }
   if (log) {
     console.log("/ext request....", JSON.stringify(request));
-    console.log("/ext APIURL....", APIURL);
+    console.log("/ext API_ENDPOINT....", API_ENDPOINT);
     console.log("/ext process.env.TYBOT_ENDPOINT....", process.env.TYBOT_ENDPOINT);
   }
-  let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, TILEDESK_API_ENDPOINT: APIURL, TILEBOT_ENDPOINT:process.env.TYBOT_ENDPOINT, token: token, log: log, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
+  let directivesPlug = new DirectivesChatbotPlug({supportRequest: request, API_ENDPOINT: API_ENDPOINT, TILEBOT_ENDPOINT:process.env.TYBOT_ENDPOINT, token: token, log: log, HELP_CENTER_API_ENDPOINT: process.env.HELP_CENTER_API_ENDPOINT, cache: tdcache});
   // let directivesPlug = null;
   // PIPELINE-EXT
   // if (log) {console.log("answer to process:", JSON.stringify(answer));}
@@ -542,7 +542,7 @@ router.post('/echobot', (req, res) => {
   const tdclient = new TiledeskClient({
     projectId: projectId,
     token: token,
-    APIURL: APIURL,
+    APIURL: API_ENDPOINT,
     APIKEY: "___",
     log: false
   });
@@ -619,8 +619,8 @@ async function startApp(settings, completionCallback) {
     throw new Error("settings.API_ENDPOINT is mandatory id no settings.bots.");
   }
   else {
-    APIURL = settings.API_ENDPOINT;
-    console.log("(Tilebot) settings.API_ENDPOINT:", APIURL);
+    API_ENDPOINT = settings.API_ENDPOINT;
+    console.log("(Tilebot) settings.API_ENDPOINT:", API_ENDPOINT);
   }
 
   if (settings.REDIS_HOST && settings.REDIS_PORT) {
@@ -730,7 +730,7 @@ async function checkRequest(request_id, id_project) {
 function sendMessageToBot(TILEBOT_ENDPOINT, message, botId, callback) {
   // const jwt_token = this.fixToken(token);
   if (!TILEBOT_ENDPOINT) {
-    TILEBOT_ENDPOINT = `${APIURL}/modules/tilebot`
+    TILEBOT_ENDPOINT = `${API_ENDPOINT}/modules/tilebot`
   }
   const url = `${TILEBOT_ENDPOINT}/ext/${botId}`;
   console.log("sendMessageToBot URL", url);

package/models/TiledeskChatbotUtil.js

@@ -517,10 +517,13 @@ class TiledeskChatbotUtil {
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN, chatbotToken); // DEPRECATED
                 await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN_v2, "JWT " + chatbotToken);
             }
-            if (process.env.TILEDESK_API) {
-                await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN, chatbotToken); // DEPRECATED
-                await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN_v2, "JWT " + chatbotToken);
-            }
+            /**
+             * RefactoringCheck: can this be deleted?
+             */
+            // if (process.env.TILEDESK_API) {
+            //     await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN, chatbotToken); // DEPRECATED
+            //     await chatbot.addParameter(TiledeskChatbotConst.REQ_CHATBOT_TOKEN_v2, "JWT " + chatbotToken);
+            // }
             
             if (process.env.API_URL) {
                 await chatbot.addParameter(TiledeskChatbotConst.API_BASE_URL, process.env.API_URL);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-tybot-connector",
-  "version": "0.2.131-rc1",
+  "version": "0.2.131-rc2",
   "description": "Tiledesk Tybot connector",
   "main": "index.js",
   "scripts": {

package/tiledeskChatbotPlugs/DirectivesChatbotPlug.js

@@ -65,7 +65,7 @@ class DirectivesChatbotPlug {
 
   constructor(config) {
     this.supportRequest = config.supportRequest;
-    this.API_URL = config.TILEDESK_API_ENDPOINT;
+    this.API_ENDPOINT = config.API_ENDPOINT;
     this.TILEBOT_ENDPOINT = config.TILEBOT_ENDPOINT;
     this.token = config.token;
     this.log = config.log;
@@ -125,7 +125,7 @@ class DirectivesChatbotPlug {
     // console.log("supportRequest is:", JSON.stringify(supportRequest))
     
     const token = this.token;
-    const API_URL = this.API_URL;
+    const API_ENDPOINT = this.API_ENDPOINT;
     const TILEBOT_ENDPOINT = this.TILEBOT_ENDPOINT;
 
     // const requestId = supportRequest.request_id
@@ -142,7 +142,7 @@ class DirectivesChatbotPlug {
       tdclient = new TiledeskClient({
         projectId: projectId,
         token: token,
-        APIURL: API_URL,
+        APIURL: API_ENDPOINT,
         APIKEY: "___",
         log: this.log
       });
@@ -159,7 +159,7 @@ class DirectivesChatbotPlug {
       supportRequest: supportRequest,
       reply: this.reply,
       requestId: supportRequest.request_id,
-      TILEDESK_APIURL: API_URL,
+      API_ENDPOINT: API_ENDPOINT,
       TILEBOT_ENDPOINT: TILEBOT_ENDPOINT,
       departmentId: depId,
       tdcache: tdcache,
@@ -720,14 +720,12 @@ class DirectivesChatbotPlug {
       });
     }
     else if (directive_name === Directives.CLEAR_TRANSCRIPT) {
-      console.log("...CLEAR_TRANSCRIPT");
       new DirClearTranscript(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
         this.process(next_dir);
       });
     }
     else if (directive_name === Directives.MOVE_TO_UNASSIGNED) {
-      console.log("...MOVE_TO_UNASSIGNED");
       new DirMoveToUnassigned(context).execute(directive, async () => {
         let next_dir = await this.nextDirective(this.directives);
         this.process(next_dir);
@@ -770,7 +768,7 @@ class DirectivesChatbotPlug {
     }
     const supportRequest = this.supportRequest;
     const token = this.token;
-    const API_URL = this.API_URL;
+    const API_ENDPOINT = this.API_ENDPOINT;
     // const requestId = supportRequest.request_id
     // let depId;
     // if (supportRequest.department && supportRequest.department._id) {
@@ -780,7 +778,7 @@ class DirectivesChatbotPlug {
     const tdclient = new TiledeskClient({
       projectId: projectId,
       token: token,
-      APIURL: API_URL,
+      APIURL: API_ENDPOINT,
       APIKEY: "___",
       log: false
     });

package/tiledeskChatbotPlugs/directives/DirAddTags.js

@@ -21,6 +21,7 @@ class DirAddTags {
     this.tdcache = this.context.tdcache;
     this.requestId = this.context.requestId;
     this.tdClient = this.context.tdclient;
+    this.API_ENDPOINT = this.context.API_ENDPOINT;
     // this.intentDir = new DirIntent(context);
     this.log = context.log;
     // this.log = true;
@@ -77,12 +78,6 @@ class DirAddTags {
       console.log("(DirAddTags) tags: ", filled_tags);
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
-    if (this.log) {
-      console.log("(DirAddTags) server_base_url ", server_base_url);
-    }
-
-
     // let request = await this.tdClient.getRequestById(this.requestId);
     // if (this.log) { console.log('(DirAddTags) request detail: ', request) }
     // if(!request){
@@ -91,7 +86,6 @@ class DirAddTags {
     //   return;
     // }
 
-
     /** use case: CONVERSATION */
     if(target === 'request'){
       
@@ -99,7 +93,7 @@ class DirAddTags {
 
       if(action.pushToList){
         newTags.forEach(async (tag) => {
-          let tags = await this.addNewTag(server_base_url,tag)
+          let tags = await this.addNewTag(tag)
           if(!tags){
             callback();
             return;
@@ -108,7 +102,7 @@ class DirAddTags {
       }
 
       if (this.log) { console.log('(DirAddTags) UPDATE request with newTags', newTags) }
-      let updatedRequest = await this.updateRequestWithTags(server_base_url, newTags)
+      let updatedRequest = await this.updateRequestWithTags(newTags)
       if(!updatedRequest){
         callback();
         return;
@@ -130,7 +124,7 @@ class DirAddTags {
 
       if(action.pushToList){
         newTags.forEach(async (tag) => {
-          let tags = await this.addNewTag(server_base_url,tag)
+          let tags = await this.addNewTag(tag)
           if(!tags){
             callback();
             return;
@@ -139,7 +133,7 @@ class DirAddTags {
       }
 
       if (this.log) {  console.log('(DirAddTags) UPDATE lead with newTags', newTags) }
-      let updatedLead = await this.updateLeadWithTags(server_base_url, request.lead._id, newTags)
+      let updatedLead = await this.updateLeadWithTags(request.lead._id, newTags)
       if(!updatedLead){
         callback();
         return;
@@ -273,10 +267,10 @@ class DirAddTags {
       });
   }
 
-  async addNewTag(server_base_url, tag){
+  async addNewTag(tag){
     return new Promise((resolve, rejects)=> {
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/tags",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/tags",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -305,7 +299,7 @@ class DirAddTags {
   }
 
 
-  async updateRequestWithTags(server_base_url, tags) {
+  async updateRequestWithTags(tags) {
     return new Promise((resolve) => {
       let json = []
       let filteredTags = tags.map((tag) => ({tag: tag, color: '#f0806f'}))
@@ -314,7 +308,7 @@ class DirAddTags {
         console.log('(httprequest) DirAddTags updateRequestWithTags tags--> ', json)
       }
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/requests/" + this.requestId + '/tag',
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/requests/" + this.requestId + '/tag',
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -340,10 +334,10 @@ class DirAddTags {
     })
   }
 
-  async updateLeadWithTags(server_base_url, lead_id, tags) {
+  async updateLeadWithTags(lead_id, tags) {
     return new Promise((resolve) => {
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/leads/" + lead_id + '/tag',
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/leads/" + lead_id + '/tag',
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirAskGPT.js

@@ -15,6 +15,7 @@ class DirAskGPT {
     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;
   }
 
@@ -88,17 +89,13 @@ class DirAskGPT {
     const filler = new Filler();
     const filled_question = filler.fill(action.question, requestVariables);
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const kb_endpoint = process.env.KB_ENDPOINT;
-    if (this.log) {
-      console.log("DirAskGPT ApiEndpoint URL: ", server_base_url);
-      console.log("DirAskGPT KbEndpoint URL: ", kb_endpoint);
-    }
+    if (this.log) { console.log("DirAskGPT KbEndpoint URL: ", kb_endpoint); }
 
-    let key = await this.getKeyFromIntegrations(server_base_url);
+    let key = await this.getKeyFromIntegrations();
     if (!key) {
       if (this.log) { console.log("DirAskGPT - Key not found in Integrations. Searching in kb settings..."); }
-      key = await this.getKeyFromKbSettings(server_base_url);
+      key = await this.getKeyFromKbSettings();
     }
 
     if (!key) {
@@ -120,7 +117,7 @@ class DirAskGPT {
     }
 
     if (publicKey === true) {
-      let keep_going = await this.checkQuoteAvailability(server_base_url);
+      let keep_going = await this.checkQuoteAvailability();
       if (keep_going === false) {
         if (this.log) { console.log("DirAskGPT - Quota exceeded for tokens. Skip the action")}
         callback();
@@ -167,7 +164,7 @@ class DirAskGPT {
 
           // if (publicKey === true) {
           //   let token_usage = resbody.usage.total_tokens;
-          //   this.updateQuote(server_base_url, token_usage);
+          //   this.updateQuote(token_usage);
           // }
           
           if (trueIntent) {
@@ -305,11 +302,11 @@ class DirAskGPT {
       });
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/openai",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -337,11 +334,11 @@ class DirAskGPT {
     })
   }
 
-  async getKeyFromKbSettings(server_base_url) {
+  async getKeyFromKbSettings() {
     return new Promise((resolve) => {
 
       const KB_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/kbsettings",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/kbsettings",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirAskGPTV2.js

@@ -19,6 +19,7 @@ class DirAskGPTV2 {
     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;
   }
 
@@ -136,18 +137,13 @@ class DirAskGPTV2 {
       if (this.log) { console.log("DirAskGPT transcript ", transcript) }
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const kb_endpoint = process.env.KB_ENDPOINT_QA
-    
-    if (this.log) {
-      console.log("DirAskGPT ApiEndpoint URL: ", server_base_url);
-      console.log("DirAskGPT KbEndpoint URL: ", kb_endpoint);
-    }
+    if (this.log) { console.log("DirAskGPT KbEndpoint URL: ", kb_endpoint); }
 
-    let key = await this.getKeyFromIntegrations(server_base_url);
+    let key = await this.getKeyFromIntegrations();
     if (!key) {
       if (this.log) { console.log("DirAskGPT - Key not found in Integrations. Searching in kb settings..."); }
-      key = await this.getKeyFromKbSettings(server_base_url);
+      key = await this.getKeyFromKbSettings();
     }
 
     if (!key) {
@@ -169,7 +165,7 @@ class DirAskGPTV2 {
     }
 
     if (publicKey === true) {
-      let keep_going = await this.checkQuoteAvailability(server_base_url);
+      let keep_going = await this.checkQuoteAvailability();
       if (keep_going === false) {
         if (this.log) { console.log("DirAskGPT - Quota exceeded for tokens. Skip the action")}
         await this.chatbot.addParameter("flowError", "AskGPT Error: tokens quota exceeded");
@@ -183,12 +179,11 @@ class DirAskGPTV2 {
     if (action.namespaceAsName) {
       // Namespace could be an attribute
       const filled_namespace = filler.fill(action.namespace, requestVariables)
-      // namespace = await this.getNamespaceIdFromName(server_base_url, action.namespace)
-      ns = await this.getNamespace(server_base_url, filled_namespace, null);
+      ns = await this.getNamespace(filled_namespace, null);
       namespace = ns.id;
       if (this.log) { console.log("DirAskGPT - Retrieved namespace id from name ", namespace); }
     } else {
-      ns = await this.getNamespace(server_base_url, null, namespace);
+      ns = await this.getNamespace(null, namespace);
     }
 
     if (ns.engine) {
@@ -242,7 +237,6 @@ class DirAskGPTV2 {
     if (this.log) { console.log("DirAskGPT json:", json); }
 
     const HTTPREQUEST = {
-      // url: server_base_url + "/" + this.context.projectId + "/kb/qa",
       url: kb_endpoint + "/qa",
       headers: {
         'Content-Type': 'application/json',
@@ -284,7 +278,7 @@ class DirAskGPTV2 {
               tokens: resbody.prompt_token_size,
               model: json.model
             }
-            this.updateQuote(server_base_url, tokens_usage);
+            this.updateQuote(tokens_usage);
           }
 
           if (trueIntent) {
@@ -420,11 +414,11 @@ class DirAskGPTV2 {
       });
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/openai",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -452,11 +446,11 @@ class DirAskGPTV2 {
     })
   }
 
-  async getKeyFromKbSettings(server_base_url) {
+  async getKeyFromKbSettings() {
     return new Promise((resolve) => {
 
       const KB_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/kbsettings",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/kbsettings",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -482,11 +476,11 @@ class DirAskGPTV2 {
     })
   }
 
-  async checkQuoteAvailability(server_base_url) {
+  async checkQuoteAvailability() {
     return new Promise((resolve) => {
 
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/quotes/tokens",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/tokens",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -512,11 +506,11 @@ class DirAskGPTV2 {
     })
   }
 
-  async updateQuote(server_base_url, tokens_usage) {
+  async updateQuote(tokens_usage) {
     return new Promise((resolve) => {
 
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/quotes/incr/tokens",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/incr/tokens",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -588,10 +582,10 @@ class DirAskGPTV2 {
     return objectTranscript;
   }
 
-  async getNamespace(server_base_url, name, id) {
+  async getNamespace(name, id) {
     return new Promise((resolve) => {
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/kb/namespace/all",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/kb/namespace/all",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -633,39 +627,6 @@ class DirAskGPTV2 {
     })
   }
 
-  // async getNamespaceIdFromName(server_base_url, name) {
-  //   return new Promise((resolve) => {
-
-  //     const HTTPREQUEST = {
-  //       url: server_base_url + "/" + this.context.projectId + "/kb/namespace/all",
-  //       headers: {
-  //         'Content-Type': 'application/json',
-  //         'Authorization': 'JWT ' + this.context.token
-  //       },
-  //       method: "GET"
-  //     }
-  //     if (this.log) { console.log("DirAskGPT get all namespaces HTTPREQUEST", HTTPREQUEST); }
-
-  //     this.#myrequest(
-  //       HTTPREQUEST, async (err, namespaces) => {
-  //         if (err) {
-  //           console.error("(httprequest) DirAskGPT get all namespaces err: ", err);
-  //           resolve(null)
-  //         } else {
-  //           if (this.log) { console.log("(httprequest) DirAskGPT get all namespaces resbody: ", namespaces); }
-
-  //           let namespace = namespaces.find(n => n.name === name);
-  //           let namespace_id = namespace.id;
-
-  //           resolve(namespace_id);
-  //         }
-  //       }
-  //     )
-  //   })
-
-  // }
-
-
 }
 
 module.exports = { DirAskGPTV2 }

package/tiledeskChatbotPlugs/directives/DirAssistant.js

@@ -14,6 +14,7 @@ class DirAssistant {
     this.tdcache = context.tdcache;
     this.requestId = context.requestId;
     this.intentDir = new DirIntent(context);
+    this.API_ENDPOINT = context.API_ENDPOINT;
     this.log = context.log;
   }
 
@@ -264,8 +265,7 @@ class DirAssistant {
       return process.env.TEST_OPENAI_APIKEY
     }
     else {
-      const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
-      return await this.getKeyFromIntegrations(server_base_url);
+      return await this.getKeyFromIntegrations();
     }
   }
 
@@ -496,11 +496,11 @@ class DirAssistant {
     });
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/openai",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirBrevo.js

@@ -16,6 +16,7 @@ class DirBrevo {
     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;
   }
 
@@ -71,14 +72,10 @@ class DirBrevo {
       return;
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const brevo_base_url = process.env.BREVO_ENDPOINT || "https://api.brevo.com/v3"
-    if (this.log) {
-      console.log("DirBrevo server_base_url ", server_base_url);
-      console.log("DirBrevo brevo_base_url ", brevo_base_url);
-    }
+    if (this.log) { console.log("DirBrevo brevo_base_url ", brevo_base_url); }
 
-    let key = await this.getKeyFromIntegrations(server_base_url);
+    let key = await this.getKeyFromIntegrations();
     if (this.log) { console.log('DirBrevo key Debug1: ', key) }
     // ONLY FOR DEBUG CANCELLARE!!!!!
     //  if (process.env.BREVO_DEBUG == '1') {
@@ -320,11 +317,11 @@ class DirBrevo {
     }
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/Brevo",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/Brevo",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirCustomerio.js

@@ -16,6 +16,7 @@ class DirCustomerio {
     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;
   }
 
@@ -69,14 +70,10 @@ class DirCustomerio {
       return;
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const customerio_base_url = process.env.CUSTOMERIO_ENDPOINT || "https://track.customer.io/api/v1";
-    if (this.log) {
-      console.log("DirCustomerio server_base_url: ", server_base_url);
-      console.log("DirCustomerio customerio_base_url: ", customerio_base_url);
-    }
+    if (this.log) { console.log("DirCustomerio customerio_base_url: ", customerio_base_url); }
 
-    let key = await this.getKeyFromIntegrations(server_base_url);
+    let key = await this.getKeyFromIntegrations();
     if (!key) {
       if (this.log) { console.log("DirCustomerio - Key not found in Integrations."); }
       let status = 422;
@@ -287,11 +284,11 @@ class DirCustomerio {
     }
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/customerio",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/customerio",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirGptTask.js

@@ -18,6 +18,7 @@ class DirGptTask {
     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;
   }
 
@@ -112,18 +113,13 @@ class DirGptTask {
       }
     }
 
-
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const openai_url = process.env.OPENAI_ENDPOINT + "/chat/completions";
-    if (this.log) {
-      console.log("DirGptTask server_base_url ", server_base_url);
-      console.log("DirGptTask openai_url ", openai_url);
-    }
+    if (this.log) { console.log("DirGptTask openai_url ", openai_url); }
 
-    let key = await this.getKeyFromIntegrations(server_base_url);
+    let key = await this.getKeyFromIntegrations();
     if (!key) {
       if (this.log) { console.log("DirGptTask - Key not found in Integrations. Searching in kb settings..."); }
-      key = await this.getKeyFromKbSettings(server_base_url);
+      key = await this.getKeyFromKbSettings();
     }
 
     if (!key) {
@@ -146,7 +142,7 @@ class DirGptTask {
     }
 
     if (publicKey === true) {
-      let keep_going = await this.checkQuoteAvailability(server_base_url);
+      let keep_going = await this.checkQuoteAvailability();
       if (keep_going === false) {
         if (this.log) { console.log("DirGptTask - Quota exceeded for tokens. Skip the action")}
         await this.chatbot.addParameter("flowError", "GPT Error: tokens quota exceeded");
@@ -230,7 +226,7 @@ class DirGptTask {
               tokens: resbody.usage.total_tokens,
               model: json.model
             }
-            this.updateQuote(server_base_url, tokens_usage);
+            this.updateQuote(tokens_usage);
           }
 
           if (trueIntent) {
@@ -368,11 +364,11 @@ class DirGptTask {
       });
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/openai",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -399,11 +395,11 @@ class DirGptTask {
     })
   }
 
-  async getKeyFromKbSettings(server_base_url) {
+  async getKeyFromKbSettings() {
     return new Promise((resolve) => {
 
       const KB_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/kbsettings",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/kbsettings",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -432,11 +428,11 @@ class DirGptTask {
     })
   }
 
-  async checkQuoteAvailability(server_base_url) {
+  async checkQuoteAvailability() {
     return new Promise((resolve) => {
 
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/quotes/tokens",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/tokens",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token
@@ -461,11 +457,11 @@ class DirGptTask {
     })
   }
 
-  async updateQuote(server_base_url, tokens_usage) {
+  async updateQuote(tokens_usage) {
     return new Promise((resolve) => {
 
       const HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/quotes/incr/tokens",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/quotes/incr/tokens",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirGptTask_OLD.js

@@ -15,6 +15,7 @@ class DirGptTask {
     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;
   }
 
@@ -85,15 +86,11 @@ class DirGptTask {
       console.log("DirGptTask temperature: ", temperature);
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const openai_url = process.env.OPENAI_ENDPOINT + "/chat/completions";
-    if (this.log) {
-      console.log("DirGptTask server_base_url ", server_base_url);
-      console.log("DirGptTask openai_url ", openai_url);
-    }
+    if (this.log) { console.log("DirGptTask openai_url ", openai_url); }
 
     const INTEGRATIONS_HTTPREQUEST = {
-      url: server_base_url + "/" + this.context.projectId + "/integration/name/openai",
+      url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/openai",
       headers: {
         'Content-Type': 'application/json',
         'Authorization': 'JWT ' + this.context.token
@@ -127,7 +124,7 @@ class DirGptTask {
             if (this.log) { console.log("DirGptTask - Key not found in Integrations. Searching in kb settings..."); }
 
             const KB_HTTPREQUEST = {
-              url: server_base_url + "/" + this.context.projectId + "/kbsettings",
+              url: this.API_ENDPOINT + "/" + this.context.projectId + "/kbsettings",
               headers: {
                 'Content-Type': 'application/json',
                 'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirHubspot.js

@@ -16,6 +16,7 @@ class DirHubspot {
     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;
   }
 
@@ -71,14 +72,10 @@ class DirHubspot {
       return;
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const hubspot_base_url = process.env.HUBSPOT_ENDPOINT || "https://api.hubapi.com/crm/v3/";
-    if (this.log) {
-      console.log("DirHubspot server_base_url ", server_base_url);
-      console.log("DirHubspot hubspot_base_url ", hubspot_base_url);
-    }
+    if (this.log) { console.log("DirHubspot hubspot_base_url ", hubspot_base_url); }
 
-    let key = await this.getKeyFromIntegrations(server_base_url);
+    let key = await this.getKeyFromIntegrations();
     if (!key) {
       if (this.log) { console.log("DirHubspot - Key not found in Integrations."); }
       if (falseIntent) {
@@ -289,11 +286,11 @@ class DirHubspot {
     }
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/hubspot",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/hubspot",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirIfOpenHours.js

@@ -12,32 +12,8 @@ class DirIfOpenHours {
     }
     this.tdclient = context.tdclient;
     this.context = context;
-    // this.tdclient = new TiledeskClient({
-    //   projectId: context.projectId,
-    //   token: context.token,
-    //   APIURL: context.TILEDESK_APIURL,
-    //   APIKEY: "___",
-    //   log: context.log
-    // });
-    // let context =  {
-    //   projectId: projectId,
-    //   token: token,
-    //   requestId: supportRequest,
-    //   APIURL: API_URL,
-    //   TILEBOT_ENDPOINT:TILEBOT_ENDPOINT,
-    //   departmentId: depId,
-    //   log: false
-    // }
+    this.API_ENDPOINT = context.API_ENDPOINT;
     this.intentDir = new DirIntent(context);
-    //   {
-    //     API_ENDPOINT: context.TILEDESK_APIURL,
-    //     TILEBOT_ENDPOINT: context.TILEBOT_ENDPOINT,
-    //     supportRequest: context.supportRequest,
-    //     token: context.token,
-    //     log: context.log
-    //   }
-    // );
-    //this.log = context.log;
   }
 
   execute(directive, callback) {
@@ -95,10 +71,7 @@ class DirIfOpenHours {
       slot_id = action.slotId;
     }
     
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
-    if (this.log) { console.log("DirAskGPT ApiEndpoint URL: ", server_base_url); }
-    
-    let isopen_url = server_base_url + "/projects/" + this.context.projectId + "/isopen";
+    let isopen_url = this.API_ENDPOINT + "/projects/" + this.context.projectId + "/isopen";
     if (slot_id) {
       isopen_url = isopen_url.concat("?timeSlot=" + slot_id);
     }

package/tiledeskChatbotPlugs/directives/DirQapla.js

@@ -15,6 +15,7 @@ class DirQapla {
     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;
   }
 
@@ -82,18 +83,14 @@ class DirQapla {
       return;
     }
 
-    const server_base_url = process.env.API_ENDPOINT || process.env.API_URL;
     const qapla_base_url = process.env.QAPLA_ENDPOINT || "https://api.qapla.it/1.2"
-    if (this.log) { 
-      console.log("DirQapla server_base_url: ", qapla_base_url); 
-      console.log("DirQapla qapla_base_url: ", qapla_base_url); 
-    }
+    if (this.log) { console.log("DirQapla qapla_base_url: ", qapla_base_url); }
 
     let key = action.apiKey;
 
     if (!key) {
       if (this.log) { console.log("DirQapla - Key not found into action. Searching in integrations..."); }
-      key = await this.getKeyFromIntegrations(server_base_url);
+      key = await this.getKeyFromIntegrations();
     }
 
     if (!key) {
@@ -288,11 +285,11 @@ class DirQapla {
       });
   }
 
-  async getKeyFromIntegrations(server_base_url) {
+  async getKeyFromIntegrations() {
     return new Promise((resolve) => {
 
       const INTEGRATIONS_HTTPREQUEST = {
-        url: server_base_url + "/" + this.context.projectId + "/integration/name/qapla",
+        url: this.API_ENDPOINT + "/" + this.context.projectId + "/integration/name/qapla",
         headers: {
           'Content-Type': 'application/json',
           'Authorization': 'JWT ' + this.context.token

package/tiledeskChatbotPlugs/directives/DirSendWhatsapp.js

@@ -16,6 +16,7 @@ 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;
   }
 
@@ -73,12 +74,11 @@ 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 = server_base_url + "/modules/whatsapp/api"
+      whatsapp_api_url = this.API_ENDPOINT + "/modules/whatsapp/api"
     }
     if (this.log) { console.log("DirSendWhatsapp whatsapp_api_url: ", whatsapp_api_url); };
 

package/tiledeskChatbotPlugs/directives/DirWhatsappByAttribute.js

@@ -10,6 +10,7 @@ class DirWhatsappByAttribute {
       throw new Error('context object is mandatory');
     }
     this.context = context;
+    this.API_ENDPOINT = context.API_ENDPOINT;
     this.log = context.log;
   }
 
@@ -35,15 +36,12 @@ 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 = server_base_url + "/modules/whatsapp/api"
+      whatsapp_api_url = this.API_ENDPOINT + "/modules/whatsapp/api"
     }
     console.log("DirWhatsappByAttribute whatsapp_api_url: ", whatsapp_api_url);
 
@@ -94,62 +92,6 @@ 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