@tiledesk/tiledesk-server 2.4.7 → 2.4.9

package/.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
     # You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
     # A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/node
     docker:
-      - image: cimg/node:15.1
+      - image: cimg/node:16.17.1
     # Then run your tests!
     # CircleCI will report the results back to your VCS provider.
     steps:

package/app.js

@@ -132,6 +132,7 @@ var settingDataLoader = require('./services/settingDataLoader');
 var schemaMigrationService = require('./services/schemaMigrationService');
 var RouterLogger = require('./models/routerLogger');
 var cacheEnabler = require("./services/cacheEnabler");
+const session = require('express-session');
 
 require('./services/mongoose-cache-fn')(mongoose);
 
@@ -270,6 +271,16 @@ if (process.env.ENABLE_ACCESSLOG) {
 
 app.use(passport.initialize());
 
+// After you declare "app"
+if (process.env.DISABLE_SESSION_STRATEGY==true ||  process.env.DISABLE_SESSION_STRATEGY=="true" ) {
+  winston.info("Express Session disabled");
+} else {
+  // https://www.npmjs.com/package/express-session
+  let sessionSecret = process.env.SESSION_SECRET || "tiledesk-session-secret";
+  winston.info("Express Session Secret: " + sessionSecret);
+  app.use(session({ secret: sessionSecret}));
+  app.use(passport.session());
+}
 
 //ATTENTION. If you use AWS Api Gateway you need also to configure the cors policy https://docs.aws.amazon.com/apigateway/latest/developerguide/how-to-cors-console.html
 app.use(cors());

package/config/email.js

@@ -3,7 +3,7 @@ module.exports = {
   'username': 'postmaster@mg.tiledesk.com',
   'from': 'Tiledesk Notification <postmaster@mg.tiledesk.com>',
   'bcc': '',
-  'baseUrl':'https://console.tiledesk.com/v2/dashboard',
+  'baseUrl':'http://localhost:8081/dashboard',
   'replyEnabled' : false,
   'inboundDomain': 'tickets.tiledesk.com'
 };

package/event/botEvent.js

@@ -3,12 +3,20 @@ const messageEvent = require('../event/messageEvent');
 const Faq_kb = require('../models/faq_kb');
 var winston = require('../config/winston');
 
-class BotEvent extends EventEmitter {}
+
 const cacheUtil = require("../utils/cacheUtil");
 const cacheEnabler = require("../services/cacheEnabler");
 
-const botEvent = new BotEvent();
+// class BotEvent extends EventEmitter {}
+class BotEvent extends EventEmitter {
+    constructor() {
+        super();
+        this.queueEnabled = false;
+        this.setMaxListeners(11);
+      }
+}
 
+const botEvent = new BotEvent();
 
 //TODO use request. getBotId
 function getBotFromParticipants(participants) {
@@ -111,8 +119,10 @@ messageEvent.on('message.create', function(message) {
 
 
     let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
+//TODO unselect secret. secret is unselectable by default in the model
 
         if (cacheEnabler.faq_kb) {
+            winston.debug('message.id_project+":faq_kbs:id:"+botId: '+ message.id_project+":faq_kbs:id:"+botId);  
           qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId)
           winston.debug('faq_kb cache enabled');
         }

package/middleware/has-role.js

@@ -50,6 +50,12 @@ class RoleChecker {
               return true
             } else {
               winston.debug("isTypeAsFunction is false");
+
+              var adminEmail = process.env.ADMIN_EMAIL || "admin@tiledesk.com";
+
+              if (user && user.email && user.email === adminEmail) { //skip has role check 
+                return true;
+              }
               return false;
             }
        }

package/middleware/passport.js

@@ -511,6 +511,7 @@ if (enableGoogleSignin==true) {
 
           var auth = new Auth({
             providerId: issuer,
+            email: email,
             subject: profile.id,
           });
           auth.save(function (err, authSaved) {    

package/models/auth.js

@@ -12,9 +12,17 @@ var AuthSchema = new Schema({
         default: 'password',
         required: true
      },
+     subject: {
+        type: String,
+        required: true
+     },
+     email: {
+        type: String,        
+     },
      password: {
         type: String,
-        required: true,
+        required: false,
+        // required: true,
         // https://stackoverflow.com/questions/12096262/how-to-protect-the-password-field-in-mongoose-mongodb-so-it-wont-return-in-a-qu
         // select: false
     },

package/models/faq_kb.js

@@ -105,6 +105,10 @@ var Faq_kbSchema = new Schema({
   publishedAt: { 
     type: Date
   },
+  trained: {
+    type: Boolean,
+    default: true
+  },
 },{
   timestamps: true
 }

package/models/lead.js

@@ -88,6 +88,9 @@ var LeadSchema = new Schema({
     default: LeadConstants.NORMAL,  
     index: true
   }, 
+  properties: {
+    type: Object,
+  },
 },{
   timestamps: true
 }
@@ -102,6 +105,8 @@ LeadSchema.index({fullname: 'text', email: 'text'},
   // suggested by atlas
 LeadSchema.index({status: 1, id_project: 1, createdAt: -1});
 
+
+
  var lead = mongoose.model('lead', LeadSchema);
 
  if (process.env.MONGOOSE_SYNCINDEX) {

package/models/user.js

@@ -55,6 +55,9 @@ var UserSchema = new Schema({
         index: true,
         // select: false
     }, 
+    description: {
+        type: String,
+    },
     // authType: { // update db old data
     //     type: String,
     //     index:true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.7",
+  "version": "2.4.9",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -44,8 +44,8 @@
     "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.7",
     "@tiledesk/tiledesk-messenger-connector": "0.1.9",
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
-    "@tiledesk/tiledesk-tybot-connector": "^0.1.77",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.45",
+    "@tiledesk/tiledesk-tybot-connector": "^0.1.78",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.46",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",
     "bcrypt-nodejs": "0.0.3",

package/public/wstest/index.html

@@ -5,55 +5,19 @@
 
             <!-- <script type="text/javascript" src="./main.js"></script> -->
 
-            // var ws = new WebSocket('wss://rtm.tiledesk.com/?token=JWT%20eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1ZWI0NWZiMjFmOWUxZjAwMTJkNjIyMDEiLCJlbWFpbCI6ImExQGExLml0IiwiZmlyc3RuYW1lIjoiYTEiLCJsYXN0bmFtZSI6ImExIiwiZW1haWx2ZXJpZmllZCI6ZmFsc2UsImlhdCI6MTU4ODg3OTI4NCwiYXVkIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJpc3MiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsInN1YiI6InVzZXIiLCJqdGkiOiI5MGIzNTY1NS1jNzY4LTQwMjEtODIyNy1hYWQ1MGU5NWFmYTEifQ.v4RjqtpM-kqa_PGVXmn9eJOeb3IWrcXH0U6V5iJrj7U');
-
             <script>
-                    var ws = new WebSocket('wss://rtm.tiledesk.com/?token=JWT%20eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1ZWI1NmUxYTFmOWUxZjAwMTJkNjIyNzUiLCJlbWFpbCI6ImxvYWRAbG9hZC5pdCIsImZpcnN0bmFtZSI6ImxvYWQiLCJsYXN0bmFtZSI6ImxvYWQiLCJlbWFpbHZlcmlmaWVkIjpmYWxzZSwiaWF0IjoxNTg4OTQ4NTA3LCJhdWQiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsImlzcyI6Imh0dHBzOi8vdGlsZWRlc2suY29tIiwic3ViIjoidXNlciIsImp0aSI6IjU0OWQ3ODI4LWI5ZDAtNDAxNS1iMDQ4LTA0M2IyYzYyZjAxOSJ9.gnGJRtUoRpUA90QWNSp1wmWmlJcu1YwYf_kJ8yUi1_I');                                                                                    
+                    var ws = new WebSocket('ws://localhost:3000/?token=JWT%20eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1ZWU4OTE5ZDg3MjJiMzAwMzQ3ZWM1NmYiLCJlbWFpbCI6ImFkbWluQHRpbGVkZXNrLmNvbSIsImZpcnN0bmFtZSI6IkFkbWluaXN0cmF0b3IiLCJsYXN0bmFtZSI6IiAiLCJlbWFpbHZlcmlmaWVkIjp0cnVlLCJpYXQiOjE2ODM2NTEyMDYsImF1ZCI6Imh0dHBzOi8vdGlsZWRlc2suY29tIiwiaXNzIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJzdWIiOiJ1c2VyIiwianRpIjoiZDVlY2U3YjctN2U0Zi00NThmLTkxYWMtNGJiMzY3NDdmNmUxIn0.KiPGusVCPR0-IROsoPiH93V_vCKJS3rK_ikjqmngQT7J_s3VHalRvGfuvds-sRg4V8rfZyhlfaR6uWR71TYPhyT7REPYORp-T-6ddb8g7nL4lraHVhzqYYpVPIhXUM81rkyHm1FP2LuIsEe93Ir62AyK0xajoS1wPdjYNBxari0');                                                                                    
+                    // var ws = new WebSocket('ws://eu.rtmv3.tiledesk.com/mqws/ws/?token=JWT%20eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1ZWI1NmUxYTFmOWUxZjAwMTJkNjIyNzUiLCJlbWFpbCI6ImxvYWRAbG9hZC5pdCIsImZpcnN0bmFtZSI6ImxvYWQiLCJsYXN0bmFtZSI6ImxvYWQiLCJlbWFpbHZlcmlmaWVkIjpmYWxzZSwiaWF0IjoxNTg4OTQ4NTA3LCJhdWQiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsImlzcyI6Imh0dHBzOi8vdGlsZWRlc2suY29tIiwic3ViIjoidXNlciIsImp0aSI6IjU0OWQ3ODI4LWI5ZDAtNDAxNS1iMDQ4LTA0M2IyYzYyZjAxOSJ9.gnGJRtUoRpUA90QWNSp1wmWmlJcu1YwYf_kJ8yUi1_I');                                                                                    
                                         ws.onopen = function () {
-                                            console.log('websocket is connected2 ...');
-                                            ws.send('{ "action": "subscribe", "payload": { "topic": "/5eb56e211f9e1f0012d6227b/requests"}}');
+                                            console.log('websocket is connected ...');
+                                            ws.send('{ "action": "subscribe", "payload": { "topic": "/6453d246f1e784003a97537b/bots/645903253e16b1002cfe4439"}}');
+                                            // ws.send('{ "action": "subscribe", "payload": { "topic": "/5eb56e211f9e1f0012d6227b/requests"}}');
                                         }
             </script>
 
 
 
 
-
-            <script>
-                    var ws = new WebSocket('wss://tiledesk-server-pre.herokuapp.com/?token=JWT%20eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1YWFhOTkwMjRjM2IxMTAwMTRiNDc4ZjAiLCJlbWFpbCI6ImFuZHJlYS5sZW9AZnJvbnRpZXJlMjEuaXQiLCJmaXJzdG5hbWUiOiJBbmRyZWEiLCJsYXN0bmFtZSI6IkxlbyIsImVtYWlsdmVyaWZpZWQiOnRydWUsImlhdCI6MTU4NzU0NjIyNiwiYXVkIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJpc3MiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsInN1YiI6InVzZXIiLCJqdGkiOiJkNDNhMmIwNi1jZGRkLTRkZDYtYjhiNC02NzdiOGI4MTQyYjIifQ.KZGvjr8oQc2sYeV1bOMvCd0_9XxaLlfIszjT_4-PlQ4');
-                                    
-                                        ws.onopen = function () {
-                                            console.log('websocket is connected2 ...');
-                                            ws.send('{ "action": "subscribe", "payload": { "topic": "/5ebae6f21aee9b0034511f65/requests"}}');
-                                        }
-            </script>
-
-
-
-
-
-            <script>
-                
-                
-                //var url = 'ws://'+window.location.host+'/?token=JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyIkX18iOnsic3RyaWN0TW9kZSI6dHJ1ZSwic2VsZWN0ZWQiOnsiZW1haWwiOjEsImZpcnN0bmFtZSI6MSwibGFzdG5hbWUiOjEsInBhc3N3b3JkIjoxLCJlbWFpbHZlcmlmaWVkIjoxLCJpZCI6MX0sImdldHRlcnMiOnt9LCJfaWQiOiI1ZGM5Mzg2MmFkZDRmNjljM2Q0NThkOGYiLCJ3YXNQb3B1bGF0ZWQiOmZhbHNlLCJhY3RpdmVQYXRocyI6eyJwYXRocyI6eyJwYXNzd29yZCI6ImluaXQiLCJlbWFpbCI6ImluaXQiLCJlbWFpbHZlcmlmaWVkIjoiaW5pdCIsIl9pZCI6ImluaXQifSwic3RhdGVzIjp7Imlnbm9yZSI6e30sImRlZmF1bHQiOnt9LCJpbml0Ijp7ImVtYWlsdmVyaWZpZWQiOnRydWUsInBhc3N3b3JkIjp0cnVlLCJlbWFpbCI6dHJ1ZSwiX2lkIjp0cnVlfSwibW9kaWZ5Ijp7fSwicmVxdWlyZSI6e319LCJzdGF0ZU5hbWVzIjpbInJlcXVpcmUiLCJtb2RpZnkiLCJpbml0IiwiZGVmYXVsdCIsImlnbm9yZSJdfSwicGF0aHNUb1Njb3BlcyI6e30sImVtaXR0ZXIiOnsiX2V2ZW50cyI6e30sIl9ldmVudHNDb3VudCI6MCwiX21heExpc3RlbmVycyI6MH0sIiRvcHRpb25zIjp0cnVlfSwiaXNOZXciOmZhbHNlLCJfZG9jIjp7ImVtYWlsdmVyaWZpZWQiOmZhbHNlLCJwYXNzd29yZCI6IiQyYSQxMCRJc0hJRm9HTmRvRnVrODVRaDZlbXN1RjFzbkphNC5ELmgud2tuS092RUdlcVJsSlpZOHdjUyIsImVtYWlsIjoiYW5kcmVhLmxlb0BmMjEuaXQiLCJfaWQiOiI1ZGM5Mzg2MmFkZDRmNjljM2Q0NThkOGYifSwiJGluaXQiOnRydWUsImlhdCI6MTU3NDYxNTY2MSwiYXVkIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJpc3MiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsInN1YiI6InVzZXIifQ.6DjvyVO-4zuHH2kdfItWx9eVGZ-HcRcs1jehVRrDWpE';
-                //var url = 'ws://'+window.location.host+'/?token=JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyIkX18iOnsic3RyaWN0TW9kZSI6dHJ1ZSwic2VsZWN0ZWQiOnsiZW1haWwiOjEsImZpcnN0bmFtZSI6MSwibGFzdG5hbWUiOjEsInBhc3N3b3JkIjoxLCJlbWFpbHZlcmlmaWVkIjoxLCJpZCI6MX0sImdldHRlcnMiOnt9LCJfaWQiOiI1ZGM5Mzg2MmFkZDRmNjljM2Q0NThkOGYiLCJ3YXNQb3B1bGF0ZWQiOmZhbHNlLCJhY3RpdmVQYXRocyI6eyJwYXRocyI6eyJwYXNzd29yZCI6ImluaXQiLCJlbWFpbCI6ImluaXQiLCJlbWFpbHZlcmlmaWVkIjoiaW5pdCIsIl9pZCI6ImluaXQifSwic3RhdGVzIjp7Imlnbm9yZSI6e30sImRlZmF1bHQiOnt9LCJpbml0Ijp7ImVtYWlsdmVyaWZpZWQiOnRydWUsInBhc3N3b3JkIjp0cnVlLCJlbWFpbCI6dHJ1ZSwiX2lkIjp0cnVlfSwibW9kaWZ5Ijp7fSwicmVxdWlyZSI6e319LCJzdGF0ZU5hbWVzIjpbInJlcXVpcmUiLCJtb2RpZnkiLCJpbml0IiwiZGVmYXVsdCIsImlnbm9yZSJdfSwicGF0aHNUb1Njb3BlcyI6e30sImVtaXR0ZXIiOnsiX2V2ZW50cyI6e30sIl9ldmVudHNDb3VudCI6MCwiX21heExpc3RlbmVycyI6MH0sIiRvcHRpb25zIjp0cnVlfSwiaXNOZXciOmZhbHNlLCJfZG9jIjp7ImVtYWlsdmVyaWZpZWQiOmZhbHNlLCJwYXNzd29yZCI6IiQyYSQxMCRJc0hJRm9HTmRvRnVrODVRaDZlbXN1RjFzbkphNC5ELmgud2tuS092RUdlcVJsSlpZOHdjUyIsImVtYWlsIjoiYW5kcmVhLmxlb0BmMjEuaXQiLCJfaWQiOiI1ZGM5Mzg2MmFkZDRmNjljM2Q0NThkOGYifSwiJGluaXQiOnRydWUsImlhdCI6MTU3NDkzNTUxOCwiYXVkIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJpc3MiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsInN1YiI6InVzZXIifQ._fZWRXAG1lBwmEbrqmvQr1ghhbcKAHgs74ki8UtDBZU';
-                //var url = 'ws://'+window.location.host+'/?token=JWT eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyIkX18iOnsic3RyaWN0TW9kZSI6dHJ1ZSwic2VsZWN0ZWQiOnsiZW1haWwiOjEsImZpcnN0bmFtZSI6MSwibGFzdG5hbWUiOjEsInBhc3N3b3JkIjoxLCJlbWFpbHZlcmlmaWVkIjoxLCJpZCI6MX0sImdldHRlcnMiOnt9LCJfaWQiOiI1YWIxMWM2YjgzZGMyNDAwMTRkNDYwOTUiLCJ3YXNQb3B1bGF0ZWQiOmZhbHNlLCJhY3RpdmVQYXRocyI6eyJwYXRocyI6eyJwYXNzd29yZCI6ImluaXQiLCJlbWFpbCI6ImluaXQiLCJfaWQiOiJpbml0In0sInN0YXRlcyI6eyJpZ25vcmUiOnt9LCJkZWZhdWx0Ijp7fSwiaW5pdCI6eyJwYXNzd29yZCI6dHJ1ZSwiZW1haWwiOnRydWUsIl9pZCI6dHJ1ZX0sIm1vZGlmeSI6e30sInJlcXVpcmUiOnt9fSwic3RhdGVOYW1lcyI6WyJyZXF1aXJlIiwibW9kaWZ5IiwiaW5pdCIsImRlZmF1bHQiLCJpZ25vcmUiXX0sInBhdGhzVG9TY29wZXMiOnt9LCJlbWl0dGVyIjp7Il9ldmVudHMiOnt9LCJfZXZlbnRzQ291bnQiOjAsIl9tYXhMaXN0ZW5lcnMiOjB9LCIkb3B0aW9ucyI6dHJ1ZX0sImlzTmV3IjpmYWxzZSwiX2RvYyI6eyJwYXNzd29yZCI6IiQyYSQxMCQ1eDUvUHJYWTJycVZTdVRQLjV2WlEuQ3JScy5sLjVWS2svNzRIb2haTXFwaEJwWHpNRUZKMiIsImVtYWlsIjoiYW5kcmVhLmxlb0BmMjEuaXQiLCJfaWQiOiI1YWIxMWM2YjgzZGMyNDAwMTRkNDYwOTUifSwiJGluaXQiOnRydWUsImlhdCI6MTU3NTAxODYzNiwiYXVkIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJpc3MiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsInN1YiI6InVzZXIifQ.ZNU49DGQNdWfPMui_J1D9QyMnBgNIiS6q92TVGVW5m4';
-                var url = 'ws://104.198.139.15'+'/?token=JWT%20eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfaWQiOiI1ZThkYTJiZTljMWY1MjAwMTdlZGJkZWYiLCJlbWFpbCI6ImFuZHJlYS5sZW9AZnJvbnRpZXJlMjEuaXQiLCJmaXJzdG5hbWUiOiJhbmRyZWEiLCJsYXN0bmFtZSI6ImxlbyIsImVtYWlsdmVyaWZpZWQiOnRydWUsImlhdCI6MTU4NjQxNjM0NSwiYXVkIjoiaHR0cHM6Ly90aWxlZGVzay5jb20iLCJpc3MiOiJodHRwczovL3RpbGVkZXNrLmNvbSIsInN1YiI6InVzZXIiLCJqdGkiOiI1ZDg1M2Q3Ny01YzJjLTQ3ZmQtOWFiMy1lZjJlZDg2ZDQyN2EifQ.s7zqrF7CrfEwlbbkb-cg8lc7VrzXRQsPRv1PVtTVqSM';
-                
-
-                tilebase = new Tilebase(url
-             
-                    , function(data, notification) {
-                        $('#messages').append(`<div id="${data._id}">${data.first_text} ${notification.event.method}</div>`);
-                    }
-                    , function(object, notification) {
-                        $('#'+data._id).html(`<div id="${data._id}">${data.first_text}  ${notification.event.method}</div>`);
-                    }
-                    );
-                    //tilebase.start('{ "action": "subscribe", "payload": { "topic": "topic1"}}');
-                    tilebase.start();
-                  
-            </script>
     </head>
     <bdoy>
             <h1>

package/pubmodules/apps/listener.js

@@ -6,13 +6,13 @@ var config = require('../../config/database'); // get db config file
 let configSecretOrPubicKay = process.env.GLOBAL_SECRET || config.secret;   
 
 var pKey = process.env.GLOBAL_SECRET_OR_PUB_KEY;
-console.log("pKey",pKey);
+// console.log("pKey",pKey);
 
 if (pKey) {
   configSecretOrPubicKay = pKey.replace(/\\n/g, '\n');
 }
 
-console.log("configSecretOrPubicKay",configSecretOrPubicKay);
+// console.log("configSecretOrPubicKay",configSecretOrPubicKay);
 
 class Listener {
 
@@ -23,7 +23,7 @@ class Listener {
         if (config.databaseUri) {
             winston.debug("apps config databaseUri: " + config.databaseUri);
         }
-        console.log("ACCESS_TOKEN_SECRET",process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay);
+        // console.log("ACCESS_TOKEN_SECRET",process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay);
 
         apps.startApp({
             ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || configSecretOrPubicKay,

package/pubmodules/queue/reconnect.js

@@ -2,6 +2,7 @@ var amqp = require('amqplib/callback_api');
 var winston = require('../../config/winston');
 const requestEvent = require('../../event/requestEvent');
 const messageEvent = require('../../event/messageEvent');
+const botEvent = require('../../event/botEvent');
 const authEvent = require('../../event/authEvent');
 // https://elements.heroku.com/addons/cloudamqp
 // https://gist.github.com/carlhoerberg/006b01ac17a0a94859ba#file-reconnect-js
@@ -149,6 +150,13 @@ function startWorker() {
           winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: project_user_update");
           winston.info("Data queue", oka)
         });
+
+        ch.bindQueue(_ok.queue, exchange, "faqbot_update", {}, function(err3, oka) {
+          winston.info("Queue bind: "+_ok.queue+ " err: "+err3+ " key: faqbot_update");
+          winston.info("Data queue", oka)
+        });
+
+
         ch.consume("jobs", processMsg, { noAck: false });
         winston.info("Worker is started");
       });
@@ -222,6 +230,12 @@ function work(msg, cb) {
     // requestEvent.emit('request.create.queue', msg.content);
     authEvent.emit('project_user.update.queue', JSON.parse(message_string));
   }
+
+  if (topic === 'faqbot_update') {
+    winston.info("reconnect here topic faqbot_update:" + topic); 
+    // requestEvent.emit('request.update.queue',  msg.content);
+    botEvent.emit('faqbot.update.queue',  JSON.parse(message_string));
+  }
   cb(true);
 //   WebSocket.cb(true);
 //   requestEvent.on(msg.KEYYYYYYY+'.ws', msg.content);
@@ -318,12 +332,22 @@ function listen() {
       });
     });
 
+
+    botEvent.on('faqbot.update', function(bot) {
+      setImmediate(() => {
+        winston.debug("reconnect faqbot.update")
+        publish(exchange, "faqbot_update", Buffer.from(JSON.stringify(bot)));
+        winston.info("reconnect: "+ Buffer.from(JSON.stringify(bot)))
+      });
+    });
+
 }
 
 if (process.env.QUEUE_ENABLED === "true") {
     requestEvent.queueEnabled = true;
     messageEvent.queueEnabled = true;
     authEvent.queueEnabled = true;
+    botEvent.queueEnabled = true;
     listen();
     start();
     winston.info("Queue enabled. endpint: " + url );

package/pubmodules/queue/reconnectFanout.js

@@ -2,6 +2,7 @@ var amqp = require('amqplib/callback_api');
 var winston = require('../../config/winston');
 const requestEvent = require('../../event/requestEvent');
 const messageEvent = require('../../event/messageEvent');
+const botEvent = require('../../event/botEvent');
 const authEvent = require('../../event/authEvent');
 // https://elements.heroku.com/addons/cloudamqp
 // https://gist.github.com/carlhoerberg/006b01ac17a0a94859ba#file-reconnect-js
@@ -179,6 +180,10 @@ function work(msg, cb) {
     winston.debug("reconnectfanout here topic:" + topic);
     authEvent.emit('project_user.update.queue.pubsub', JSON.parse(message_string));
   }
+  if (topic === 'faqbot_update') {
+    winston.info("reconnectfanout here topic faqbot_update:" + topic);
+    botEvent.emit('faqbot.update.queue.pubsub', JSON.parse(message_string));
+  }
   cb(true);
 //   WebSocket.cb(true);
 //   requestEvent.on(msg.KEYYYYYYY+'.ws', msg.content);
@@ -243,12 +248,24 @@ function listen() {
       publish(exchange, "project_user_update", Buffer.from(JSON.stringify(dat)));
     });
   });
+
+
+  botEvent.on('faqbot.update', function(bot) {
+    setImmediate(() => {
+      winston.debug("reconnect faqbot.update")
+      publish(exchange, "faqbot_update", Buffer.from(JSON.stringify(bot)));
+      winston.info("reconnect fan: "+ Buffer.from(JSON.stringify(bot)))
+    });
+  });
+
+
 }
 
 if (process.env.QUEUE_ENABLED === "true") {
     requestEvent.queueEnabled = true;
     messageEvent.queueEnabled = true;
     authEvent.queueEnabled = true; 
+    botEvent.queueEnabled = true;
     listen();
     start();
     winston.info("Queue Fanout enabled. endpint: " + url );

package/routes/auth.js

@@ -452,9 +452,31 @@ function (req, res) {
 });
 
 
+// http://localhost:3000/auth/google?redirect_url=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fgoogle%2Fcallback%3Ffrom%3Dsignup
+
+// http://localhost:3000/auth/google?redirect_url=http%3A%2F%2Flocalhost%3A3000%2Fauth%2Fgoogle%2Fcallbacks
+
+// http://localhost:3000/auth/google?redirect_url=%2F%23%2Fproject%2F6452281f6d68c5f419c1c577%2Fhome
+
+
 
 // Redirect the user to the Google signin page</em> 
-router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
+// router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
+router.get("/google", function(req,res,next){
+  winston.info("redirect_url: "+ req.query.redirect_url );
+  req.session.redirect_url = req.query.redirect_url;
+  // req._toParam = 'Hello';
+  passport.authenticate(
+      // 'google', { scope : ["email", "profile"], state: base64url(JSON.stringify({blah: 'text'}))  } //custom redirect_url req.query.state
+      'google', { scope : ["email", "profile"] } //custom redirect_url
+      // 'google', { scope : ["email", "profile"], callbackURL: req.query.redirect_url } //custom redirect_url
+  )(req,res,next);
+});
+
+// router.get("/google/callbacks", passport.authenticate("google", { session: false }), (req, res) => {
+//   console.log("callback_signup");
+//   res.redirect("/google/callback");
+// });
 
 // Retrieve user data using the access token received</em> 
 router.get("/google/callback", passport.authenticate("google", { session: false }), (req, res) => {
@@ -462,9 +484,17 @@ router.get("/google/callback", passport.authenticate("google", { session: false
 
   var user = req.user;
   winston.debug("user", user);
+  // winston.info("req._toParam: "+ req._toParam);
+  // winston.info("req.query.redirect_url: "+ req.query.redirect_url);
+  // winston.info("req.query.state: "+ req.query.state);
+  winston.info("req.session.redirect_url: "+ req.session.redirect_url);
+  
 
   var userJson = user.toObject();
   
+  delete userJson.password;
+
+
     var signOptions = {     
       issuer:  'https://tiledesk.com',       
       subject:  'user',
@@ -485,8 +515,19 @@ router.get("/google/callback", passport.authenticate("google", { session: false
   // return the information including token as JSON
   // res.json(returnObject);
 
-  var url = process.env.EMAIL_BASEURL+"?token=JWT "+token;
-  winston.debug("url: "+ url);
+  let dashboard_base_url = process.env.EMAIL_BASEURL || config.baseUrl;
+  winston.debug("Google Redirect dashboard_base_url: ", dashboard_base_url);
+
+  let homeurl = "/#/";
+
+  if (req.session.redirect_url) {
+    homeurl = req.session.redirect_url;
+  }
+
+  var url = dashboard_base_url+homeurl+"?token=JWT "+token;
+
+
+  winston.info("Google Redirect: "+ url);
 
   res.redirect(url);
 

package/routes/faq_kb.js

@@ -15,6 +15,7 @@ var configGlobal = require('../config/global');
 const faq = require('../models/faq');
 var jwt = require('jsonwebtoken');
 const uuidv4 = require('uuid/v4');
+var ObjectId = require('mongoose').Types.ObjectId;
 
 let chatbot_templates_api_url = process.env.CHATBOT_TEMPLATES_API_URL
 
@@ -312,6 +313,13 @@ router.put('/:faq_kbid', function (req, res) {
     update.tags = req.body.tags;
   }
 
+  if (req.body.trained != undefined) {
+    update.trained = req.body.trained;
+  }
+  // update._id = req.params.faq_kbid;
+  
+  winston.debug("update", update);
+  // "$set": req.params.faq_kbid
 
   Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {   //TODO add cache_bot_here
     if (err) {
@@ -324,6 +332,14 @@ router.put('/:faq_kbid', function (req, res) {
 });
 
 
+
+
+
+
+
+
+
+
 router.patch('/:faq_kbid/attributes', function (req, res) {   //TODO add cache_bot_here
   var data = req.body;
 
@@ -927,4 +943,30 @@ router.get('/exportjson/:id_faq_kb', (req, res) => {
 })
 
 
+
+
+router.post('/:faq_kbid/training', function (req, res) {
+
+  winston.debug(req.body);
+
+  var update = {};
+  update.trained = true;
+  // update._id = req.params.faq_kbid;
+  
+  winston.debug("update", update);
+  // "$set": req.params.faq_kbid
+
+  Faq_kb.findByIdAndUpdate(req.params.faq_kbid, update, { new: true, upsert: true }, function (err, updatedFaq_kb) {   //TODO add cache_bot_here
+    if (err) {
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+
+    botEvent.emit('faqbot.update', updatedFaq_kb);
+    res.json(updatedFaq_kb);
+  });
+});
+
+
+
+
 module.exports = router;

package/routes/images.js

@@ -23,7 +23,9 @@ const fileService = new FileGridFsService("images");
 
 
 const fileFilter = (req, file, cb) => {
-  if (file.mimetype == 'image/jpeg' || file.mimetype == 'image/png' || file.mimetype == 'image/gif'|| file.mimetype == 'image/vnd.microsoft.icon') {
+  if (file.mimetype == 'image/jpeg' || file.mimetype == 'image/png' 
+      || file.mimetype == 'image/gif'|| file.mimetype == 'image/vnd.microsoft.icon'
+      || file.mimetype == 'image/webp') {
       cb(null, true);
   } else {
       cb(null, false);

package/routes/lead.js

@@ -149,6 +149,56 @@ router.patch('/:leadid/attributes',  function (req, res) {
 
 
 
+router.patch('/:leadid/properties',  function (req, res) {
+  var data = req.body;
+
+  // TODO use service method
+
+  Lead.findById(req.params.leadid, function (err, lead) {
+    if (err) {
+      winston.error('--- > ERROR ', err);
+      return res.status(500).send({ success: false, msg: 'Error updating object.' });
+    }
+
+     if (!lead) {
+        return res.status(404).send({ success: false, msg: 'Object not found.' });
+      }
+      
+      if (!lead.properties) {
+        winston.debug("empty properties")
+        lead.properties = {};
+      }
+
+      winston.debug(" lead properties", lead.properties)
+        
+        Object.keys(data).forEach(function(key) {
+          var val = data[key];
+          winston.debug("data attributes "+key+" " +val)
+          lead.properties[key] = val;
+        });     
+        
+        winston.debug(" lead properties", lead.properties)
+
+        // https://stackoverflow.com/questions/24054552/mongoose-not-saving-nested-object
+        lead.markModified('properties');
+
+          //cacheinvalidation
+          lead.save(function (err, savedLead) {
+          if (err) {
+            winston.error("error saving lead properties",err)
+            return res.status(500).send({ success: false, msg: 'Error getting object.' });
+          }
+          winston.verbose(" saved lead properties",savedLead.toObject())
+          leadEvent.emit('lead.update', savedLead);
+
+            res.json(savedLead);
+        });
+  });
+  
+});
+
+
+
 // router.put('/:leadid', function (req, res) {
 //   winston.debug(req.body);
 //   var update = {};
@@ -199,6 +249,7 @@ router.delete('/:leadid/physical', function (req, res) {
     return res.status(403).send({ success: false, msg: 'Unauthorized.' });
   }
   
+   // TODO use findByIdAndRemove otherwise lead don't contains label object
   Lead.remove({ _id: req.params.leadid }, function (err, lead) {
     if (err) {
       winston.error('--- > ERROR ', err);

package/routes/project.js

@@ -46,6 +46,8 @@ router.put('/:projectid/downgradeplan', [passport.authenticate(['basic', 'jwt'],
 router.delete('/:projectid/physical', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRole('owner')], function (req, res) {
   winston.debug(req.body);
   // TODO delete also department, faq_kb, faq, group, label, lead, message, project_users, requests, subscription
+  
+  // TODO use findByIdAndRemove otherwise project don't contains label object
   Project.remove({ _id: req.params.projectid }, function (err, project) {
       if (err) {
           winston.error('Error deleting project ', err);
@@ -121,12 +123,18 @@ router.put('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
   if (req.body["settings.email.templates.newMessage"]!=undefined) {
     update["settings.email.templates.newMessage"] = req.body["settings.email.templates.newMessage"];
   }
+  if (req.body["settings.email.templates.newMessageFollower"]!=undefined) {
+    update["settings.email.templates.newMessageFollower"] = req.body["settings.email.templates.newMessageFollower"];
+  }
   if (req.body["settings.email.templates.ticket"]!=undefined) {
     update["settings.email.templates.ticket"] = req.body["settings.email.templates.ticket"];
   }
   if (req.body["settings.email.templates.sendTranscript"]!=undefined) {
     update["settings.email.templates.sendTranscript"] = req.body["settings.email.templates.sendTranscript"];
   }
+  if (req.body["settings.email.templates.emailDirect"]!=undefined) {
+    update["settings.email.templates.emailDirect"] = req.body["settings.email.templates.emailDirect"];
+  }
 
 
   if (req.body["settings.email.from"]!=undefined) {
@@ -512,6 +520,8 @@ router.get('/:projectid', [passport.authenticate(['basic', 'jwt'], { session: fa
       winston.warn('Project not found ');
       return res.status(404).send({ success: false, msg: 'Object not found.' });
     }
+
+     //TODO REMOVE settings from project
     res.json(project);
   });
 });
@@ -608,6 +618,8 @@ router.get('/', [passport.authenticate(['basic', 'jwt'], { session: false }), va
 
       project_users.sort((a, b) => (a.id_project && b.id_project && a.id_project.updatedAt > b.id_project.updatedAt) ? 1 : -1)
       project_users.reverse(); 
+
+      //TODO REMOVE settings from project
       res.json(project_users);
     });
 });