@tiledesk/tiledesk-server 2.4.44 → 2.4.46

package/event/botEvent.js

@@ -65,13 +65,15 @@ class BotEvent extends EventEmitter {
             }
 
             // qui potresti leggere anche +secret ed evitare prossima query in botNotification
-            let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
+            // let qbot = Faq_kb.findById(botId);  //TODO add cache_bot_here
+            let qbot = Faq_kb.findById(botId).select('+secret')
         //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');
+                    // qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId)
+                    qbot.cache(cacheUtil.defaultTTL, message.id_project+":faq_kbs:id:"+botId+":secret")
+                    winston.debug('faq_kb cache enabled');
                 }
 
                 qbot.exec(function(err, bot) {
@@ -87,6 +89,7 @@ class BotEvent extends EventEmitter {
                 }
 
                 winston.debug("bot debug", bot);
+                winston.debug('bot debug secret: '+ bot.secret);
 
                 if (bot) {
                     if (bot.type==="internal") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.44",
+  "version": "2.4.46",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/routes/auth.js

@@ -471,10 +471,10 @@ function (req, res) {
 // Redirect the user to the Google signin page</em> 
 // router.get("/google", passport.authenticate("google", { scope: ["email", "profile"] }));
 router.get("/google", function(req,res,next){
-  winston.info("redirect_url: "+ req.query.redirect_url );
+  winston.debug("redirect_url: "+ req.query.redirect_url );
   req.session.redirect_url = req.query.redirect_url;
 
-  winston.info("forced_redirect_url: "+ req.query.forced_redirect_url );
+  winston.debug("forced_redirect_url: "+ req.query.forced_redirect_url );
   req.session.forced_redirect_url = req.query.forced_redirect_url;
 
   // req._toParam = 'Hello';
@@ -539,10 +539,10 @@ router.get("/google/callback", passport.authenticate("google", { session: false
   var url = dashboard_base_url+homeurl+"?token=JWT "+token;
 
   if (req.session.forced_redirect_url) {
-    url = req.session.forced_redirect_url+"?token=JWT "+token;
+    url = req.session.forced_redirect_url+"?jwt=JWT "+token;  //attention we use jwt= (ionic) instead token=(dashboard) for ionic 
   }
 
-  winston.info("Google Redirect: "+ url);
+  winston.debug("Google Redirect: "+ url);
 
   res.redirect(url);
 

package/routes/request.js

@@ -459,7 +459,7 @@ router.put('/:requestid/agent', async (req, res) => {
   winston.debug(req.body);
    //route(request_id, departmentid, id_project) { 
    
-   
+
    var request = await Request.findOne({"request_id":req.params.requestid, id_project:req.projectid})   
    .exec();
     
@@ -817,7 +817,7 @@ router.get('/', function (req, res, next) {
 
   if (req.user instanceof Subscription) {
       //all request 
-  } else if (projectuser && projectuser.role == "owner" || projectuser.role == "admin") {
+  } else if (projectuser && (projectuser.role == "owner" || projectuser.role == "admin")) {
       //all request 
       // per uni mostrare solo quelle priprio quindi solo participants
     if (req.query.mine) {
@@ -1030,6 +1030,8 @@ router.get('/', function (req, res, next) {
   }
 
 
+  
+
   var direction = -1; //-1 descending , 1 ascending
   if (req.query.direction) {
     direction = req.query.direction;

package/services/BotSubscriptionNotifier.js

@@ -14,10 +14,13 @@ winston.debug("webhook_origin: "+webhook_origin);
 var cacheUtil = require('../utils/cacheUtil');
 var cacheEnabler = require("../services/cacheEnabler");
 
+
+
+
 class BotSubscriptionNotifier {
    
   
-  notify(bot,botWithSecret, payload) {
+  notify(bot,secret, payload) {
   
       winston.debug("BotSubscriptionNotifier bot", bot.toObject());
       winston.debug("BotSubscriptionNotifier payload", payload );
@@ -58,7 +61,7 @@ class BotSubscriptionNotifier {
       delete botPayload.description;
       delete botPayload.attributes;
 
-      var token = jwt.sign(botPayload, botWithSecret.secret, signOptions);
+      var token = jwt.sign(botPayload, secret, signOptions);
       json["token"] = token;
 
 
@@ -93,25 +96,33 @@ class BotSubscriptionNotifier {
     //modify to async
     botEvent.on('bot.message.received.notify.external', function(botNotification) {
       var bot = botNotification.bot;
-      winston.debug('getting botWithSecret');
-      let qbot = Faq_kb.findById(bot._id).select('+secret')
-
-      if (cacheEnabler.faq_kb) {
-        let id_project = bot.id_project;
-        winston.debug("id_project.id_project:"+id_project);
-        qbot.cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+bot._id+":secret")
-        winston.debug('faq_kb BotSubscriptionNotifier cache enabled');
-      }
-
-      qbot.exec(function (err, botWithSecret){   //TODO add cache_bot_here????
-        if (err) {
-          winston.debug('Error getting botWithSecret', err);
-        }
-        botSubscriptionNotifier.notify(bot, botWithSecret, botNotification.message);
-      });
+      var secret = bot.secret;
+      winston.debug('bot.message.received.notify.external: '+secret);
+
+    //   winston.debug('getting botWithSecret');
+    //   let qbot = Faq_kb.findById(bot._id).select('+secret')
+
+    //   if (cacheEnabler.faq_kb) {
+    //     let id_project = bot.id_project;
+    //     winston.debug("id_project.id_project:"+id_project);
+    //     qbot.cache(cacheUtil.defaultTTL, id_project+":faq_kbs:id:"+bot._id+":secret")
+    //     winston.debug('faq_kb BotSubscriptionNotifier cache enabled');
+    //   }
+
+    //   qbot.exec(function (err, botWithSecret){   //TODO add cache_bot_here????
+    //     if (err) {
+    //       winston.debug('Error getting botWithSecret', err);
+    //     }
+    //     botSubscriptionNotifier.notify(bot, botWithSecret, botNotification.message);
+    //   });
       
+    botSubscriptionNotifier.notify(bot, secret, botNotification.message);
+
+
     });
 
+
+
     winston.info('BotSubscriptionNotifier started');
 
   }