@tiledesk/tiledesk-server 2.2.24 → 2.2.29

package/services/departmentService.js

@@ -283,6 +283,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
               return resolve ({ 
                               department: department, available_agents: _available_agents, agents: project_users, 
                               id_bot:department.id_bot, project: project,
+                              context: context,
                               // botprefix
                               operators: [{ id_user: 'bot_' + department.id_bot }] 
                              });
@@ -386,7 +387,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
                 selectedoperator = that.getRandomAvailableOperator(_available_agents);
               }
 
-              let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, group: group, id_project: projectid, project: project };
+              let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, group: group, id_project: projectid, project: project,  context: context };
 
               that.roundRobin(objectToReturn).then(function(objectToReturnRoundRobin){
 
@@ -409,7 +410,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
            
           } else {
             // here subscription notifier??
-            var objectToReturn = { available_agents: [], agents: [], operators: [] };
+            var objectToReturn = { available_agents: [], agents: [], operators: [], context: context };
             return resolve(objectToReturn);
           }
 
@@ -447,7 +448,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
             selectedoperator = that.getRandomAvailableOperator(_available_agents);
           }
 
-          let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, id_project: projectid, project: project };
+          let objectToReturn = { available_agents: _available_agents, agents: project_users, operators: selectedoperator, department: department, id_project: projectid, project: project, context: context };
 
           that.roundRobin(objectToReturn).then(function(objectToReturnRoundRobin) {
             winston.debug("context2",context);
@@ -474,7 +475,7 @@ getOperators(departmentid, projectid, nobot, disableWebHookCall, context) {
        
       } else {
         // here subscription notifier??
-        let objectToReturn = { available_agents: [], agents: [], operators: [] };
+        let objectToReturn = { available_agents: [], agents: [], operators: [], context: context };
         return resolve(objectToReturn);
       }
 

package/services/emailService.js

@@ -98,13 +98,13 @@ class EmailService {
     this.host = process.env.EMAIL_HOST || config.host;
     winston.info('EmailService host: ' + this.host);
 
-    this.secure  = process.env.EMAIL_SECURE || false;     //gestire bene il parsing da stringa per kube
+    this.secure  = process.env.EMAIL_SECURE || false;
     winston.info('EmailService secure: ' + this.secure);
 
     this.user  = process.env.EMAIL_USERNAME || config.username;
     winston.info('EmailService username: ' + this.user);
 
-    this.port  = process.env.EMAIL_PORT;  //default is 587
+    this.port  = process.env.EMAIL_PORT;
     winston.info('EmailService port: ' + this.port);
 
 

package/services/faqService.js

@@ -8,7 +8,7 @@ const ActionsConstants = require('../models/actionsConstants');
 class FaqService {
 
 
-  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language) {
+  create(name, url, projectid, user_id, type, description, webhook_url, webhook_enabled, language, template) {
     var that = this;
     return new Promise(function (resolve, reject) {
 
@@ -37,8 +37,15 @@ class FaqService {
       
           botEvent.emit('faqbot.create', savedFaq_kb);
           
+          winston.debug('type '+ type)      
+
           if (type==="internal") {      
-            that.createGreetingsAndOperationalsFaqs(savedFaq_kb._id, savedFaq_kb.createdBy, savedFaq_kb.id_project);
+            
+            if (!template) {
+              template = "example";
+            }
+            winston.debug('template '+ template);
+            that.createGreetingsAndOperationalsFaqs(savedFaq_kb._id, savedFaq_kb.createdBy, savedFaq_kb.id_project, template);
           } else {
             winston.debug('external bot: ', savedFaq_kb);
           } 
@@ -50,33 +57,63 @@ class FaqService {
     });
   }
 
-  createGreetingsAndOperationalsFaqs(faq_kb_id, created_by, projectid, remote_faqkb_key) {
+  createGreetingsAndOperationalsFaqs(faq_kb_id, created_by, projectid, template) {
     var that = this;
     return new Promise(function (resolve, reject) {
 
       // aggiungi esempio tdAction con intent_id
-      var faqsArray = [
-        { 'question': 'Hi', 'answer': 'Hi', 'topic': 'greetings' },
-        { 'question': 'Hello', 'answer': 'Hello', 'topic': 'greetings' },
-        { 'question': 'Who are you?', 'answer': 'Hi, I\'m a bot 🤖. You can find more about me [here](https://tiledesk.com/chatbot-for-customer-service).\ntdImage:https://console.tiledesk.com/assets/images/tily-welcomebot.gif\n* See the website https://tiledesk.com/\n* Back to start tdAction:start', 'topic': 'greetings' },   
-        { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. '+ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
-        { 'question': 'Close\nResolved', 'answer': ActionsConstants.CHAT_ACTION_MESSAGE.CLOSE, 'topic': 'internal' }, 
-        { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'start', 'topic': 'internal' },            
-        { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'topic': 'internal' }, //TODO se metto spazio n * nn va      
-        { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Back to start tdAction:start', 'topic': 'sample' },    
-        { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/tiledesk-logo-x1.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
-        { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
-        { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
-        { 'question': 'Where are you?', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },    
-
-        // { 'question': 'Sample Webhook', 'answer': 'tdWebhook:https://tiledesk-bot-webhook.tiledesk.repl.co', 'topic': 'sample' },    
-        { 'question': 'Sample Action', 'answer': 'Hello 👋 Would you like to take a closer look at our offer?\n* Yes, please tdAction:yes_action\n* No tdAction:no_action','intent_display_name': 'action1', 'topic': 'sample' },    
-        { 'question': 'Yes Action', 'answer': 'Great! Take a look here:\n* Tiledesk Pricing https://tiledesk.com/pricing-cloud/',  'intent_display_name': 'yes_action','topic': 'sample' },    
-        { 'question': 'No Action', 'answer': 'All right! If you need anything, let us know.',  'intent_display_name': 'no_action','topic': 'sample' },    
-
-       
-        // action button nn si può fare perche gli id cambiano 
-      ]
+
+      winston.debug('template: '+ template);
+
+      var faqsArray;
+
+      if (template==="example") {
+
+        faqsArray = [
+          { 'question': 'Hi', 'answer': 'Hi', 'topic': 'greetings' },
+          { 'question': 'Hello', 'answer': 'Hello', 'topic': 'greetings' },
+          { 'question': 'Who are you?', 'answer': 'Hi, I\'m a bot 🤖. You can find more about me [here](https://tiledesk.com/chatbot-for-customer-service).\ntdImage:https://console.tiledesk.com/assets/images/tily-welcomebot.gif\n* See the website https://tiledesk.com/\n* Back to start tdAction:start', 'topic': 'greetings' },   
+          { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. '+ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
+          { 'question': 'Close\nResolved', 'answer': ActionsConstants.CHAT_ACTION_MESSAGE.CLOSE, 'topic': 'internal' }, 
+          { 'question': '\\start', 'answer': 'Hello 👋. I\'m a bot 🤖.\n\nChoose one of the options below or write a message to reach our staff.\n* Who are you?\n* Where are you?\n* What can you do?\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'start', 'topic': 'internal' },            
+          { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va      
+          { 'question': 'What can you do?', 'answer': 'Using natural language processing, I\'m able to find the best answer for your users. I also support images, videos etc.. Let\'s try:\n* Sample Image\n* Sample Video\n* Sample Action tdAction:action1\n* Sample Frame\n* Back to start tdAction:start', 'topic': 'sample' },    
+          { 'question': 'Sample Image', 'answer': 'tdImage:https://tiledesk.com/tiledesk-logo-x1.png\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+          { 'question': 'Sample Frame', 'answer': 'tdFrame:https://www.emanueleferonato.com/wp-content/uploads/2019/02/runner/\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+          { 'question': 'Sample Video', 'answer': 'tdVideo:https://www.youtube.com/embed/EngW7tLk6R8\n* What can you do?\n* Back to start tdAction:start', 'topic': 'sample' },    
+          { 'question': 'Where are you?', 'answer': 'We are here ❤️\ntdFrame:https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d6087916.923447935!2d8.234804542117423!3d41.836572992140624!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x12d4fe82448dd203%3A0xe22cf55c24635e6f!2sItaly!5e0!3m2!1sen!2sit!4v1613657475377!5m2!1sen!2sit\n* Back to start tdAction:start', 'topic': 'sample' },    
+  
+          // { 'question': 'Sample Webhook', 'answer': 'tdWebhook:https://tiledesk-bot-webhook.tiledesk.repl.co', 'topic': 'sample' },    
+          { 'question': 'Sample Action', 'answer': 'Hello 👋 Would you like to take a closer look at our offer?\n* Yes, please tdAction:yes_action\n* No tdAction:no_action','intent_display_name': 'action1', 'topic': 'sample' },    
+          { 'question': 'Yes Action', 'answer': 'Great! Take a look here:\n* Tiledesk Pricing https://tiledesk.com/pricing-cloud/',  'intent_display_name': 'yes_action','topic': 'sample' },    
+          { 'question': 'No Action', 'answer': 'All right! If you need anything, let us know.',  'intent_display_name': 'no_action','topic': 'sample' },    
+  
+         
+          // action button nn si può fare perche gli id cambiano 
+        ]
+
+      }
+
+      if (template==="blank") {
+
+        faqsArray = [         
+          { 'question': '\\start', 'answer': 'Hello', 'intent_display_name': 'start', 'topic': 'internal' },            
+          { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va              
+        ]
+
+      }
+
+
+      if (template==="handoff") {
+
+        faqsArray = [         
+          { 'question': '\\start', 'answer': 'Hello', 'intent_display_name': 'start', 'topic': 'internal' },            
+          { 'question': '👨🏻‍🦰 I want an agent', 'answer': 'We are looking for an operator.. '+ActionsConstants.CHAT_ACTION_MESSAGE.AGENT, 'intent_display_name': 'agent_handoff', 'topic': 'internal' },
+          { 'question': 'defaultFallback', 'answer': 'I can not provide an adequate answer. Write a new question or talk to a human agent.\n* Back to start tdAction:start\n* See the docs https://docs.tiledesk.com/\n* 👨🏻‍🦰 I want an agent', 'intent_display_name': 'defaultFallback', 'topic': 'internal' }, //TODO se metto spazio n * nn va              
+        ]
+
+      }
+      
       
       faqsArray.forEach(faq => {
 
@@ -101,10 +138,6 @@ class FaqService {
           winston.debug('FAQ SERVICE (save new faq) - QUESTION OF THE NEW GREETINGS FAQ CREATED ', savedFaq.question)
           winston.debug('FAQ SERVICE (save new faq) - ANSWER OF THE NEW GREETINGS FAQ CREATED ', savedFaq.answer)
           winston.debug('FAQ SERVICE (save new faq) - ID FAQKB GET IN THE OBJECT OF NEW FAQ CREATED ', savedFaq.id_faq_kb)
-          // res.json({ 'Greetings Faqs': savedFaq });
-          // return resolve(savedFaq);
-
-          // that.createRemoteFaq(remote_faqkb_key, savedFaq);
 
         })
       });

package/utils/orgUtil.js

@@ -0,0 +1,74 @@
+
+
+'use strict';
+var global = require('../config/global');
+var email = require('../config/email');
+var winston = require('../config/winston');
+
+
+
+
+class OrgUtil {
+
+    constructor() {
+        this.ORGANIZATION_ENABLED = process.env.ORGANIZATION_ENABLED || global.organizationEnabled;
+        if (this.ORGANIZATION_ENABLED===true || this.ORGANIZATION_ENABLED === "true") {
+            this.ORGANIZATION_ENABLED = true;
+        }else {
+            this.ORGANIZATION_ENABLED = false;
+        }
+
+        winston.info("Organization enabled: "+ this.ORGANIZATION_ENABLED );
+
+        this.ORGANIZATION_BASE_URL = process.env.ORGANIZATION_BASE_URL || global.organizationBaseUrl;
+        winston.info("Organization base url: "+ this.ORGANIZATION_BASE_URL );
+
+    }
+
+    getOrg(req) {
+
+        // if (this.ORGANIZATION_ENABLED===false) {
+        //     return undefined;
+        // }
+
+
+        // let host = req.get('host');
+        // winston.info("host: "+ host );
+
+        let origin = req.get('origin');
+        winston.info("origin: "+ origin );
+
+        // winston.info("email: " + email.baseUrl);
+        winston.info("this.ORGANIZATION_BASE_URL: " + this.ORGANIZATION_BASE_URL); 
+        // global.organizationBaseUrl
+        // if (host !=email.baseUrl ) {
+        if (origin && origin.indexOf(this.ORGANIZATION_BASE_URL)>-1) {
+        // if (origin!=this.ORGANIZATION_BASE_URL) {
+            // winston.info("host found: "+ host );
+            // return host;
+            winston.info("origin found: "+ origin );
+            return origin;
+        }
+        winston.info("origin not found: "+ origin );
+        
+        // winston.info("host not found: "+ host );
+        // if (host.indexOf("localhost1")>-1) {
+        //     console.log("host found: "+ host );
+        //     return "localhost";
+        // }
+        return undefined;
+     
+    }
+
+   
+
+
+      
+  
+}
+
+
+var orgUtil = new OrgUtil();
+
+
+module.exports = orgUtil;