@tiledesk/tiledesk-server 2.1.40 → 2.2.3

package/websocket/webSocketServer.js

@@ -22,6 +22,7 @@ var cacheUtil = require('../utils/cacheUtil');
 var mongoose = require('mongoose');
 const requestConstants = require("../models/requestConstants");
 var RoleConstants = require('../models/roleConstants');
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
 
 
 
@@ -70,14 +71,14 @@ class WebSocketServer {
 
           var token = queryParameter.token;
           winston.debug('token:'+ token);
-          winston.debug('config.secret:'+ config.secret);
+          winston.debug('configSecret:'+ configSecret);
 
         
           if (!token)
               cb(false, 401, 'Unauthorized');
           else {
             token = token.replace('JWT ', '');            
-              jwt.verify(token, config.secret, function (err, decoded) {
+              jwt.verify(token, configSecret, function (err, decoded) {
                   if (err) {
                      winston.error('WebSocket error verifing websocket jwt token ', err);
                      return cb(false, 401, 'Unauthorized');
@@ -619,10 +620,11 @@ class WebSocketServer {
           requestJSON.snapshot = {};
 
 
+
           
            // ATTENTO  https://stackoverflow.com/questions/64059795/mongodb-get-error-message-mongoerror-path-collision-at-activity
           try {
-            var snapshotAgents = await Request.findById(request.id).select({"snapshot.agents":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
+            var snapshotAgents = await Request.findById(request.id).select({"snapshot":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
             winston.debug('snapshotAgents',snapshotAgents);  
             // requestJSON.snapshot.agents = snapshotAgents;
 
@@ -665,8 +667,9 @@ class WebSocketServer {
           requestJSON.snapshot = {};
 
           // ATTENTO  https://stackoverflow.com/questions/64059795/mongodb-get-error-message-mongoerror-path-collision-at-activity
+
           try {
-            var snapshotAgents = await Request.findById(request.id).select({"snapshot.agents":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
+            var snapshotAgents = await Request.findById(request.id).select({"snapshot":1}).exec(); //SEMBRA CHE RITORNI TUTTO LO SNAPSHOT INVECE CHE SOLO AGENTS
             winston.debug('snapshotAgents',snapshotAgents);  
             // requestJSON.snapshot.agents = snapshotAgents;