@tiledesk/tiledesk-server 2.1.4-0.3 → 2.1.4-0.31

package/models/faq_kb.js

@@ -53,6 +53,11 @@ var Faq_kbSchema = new Schema({
     default: uuidv4(),
     select: false
   },
+  language: {
+    type: String,
+    required: false,
+    // index: true
+  },
   attributes: {
     type: Object,
   },

package/models/message.js

@@ -6,6 +6,12 @@ var MessageConstants = require('../models/messageConstants');
 var defaultFullTextLanguage = process.env.DEFAULT_FULLTEXT_INDEX_LANGUAGE || "none";
 
 var MessageSchema = new Schema({
+  // messageId: {
+  //   type: String,
+  //   required: true,
+  //   // unique: true???
+  //   index: true
+  // },
   sender: {
     type: String,
     required: true,
@@ -21,10 +27,10 @@ var MessageSchema = new Schema({
     required: true,
     index: true
   },
-  // recipientFullname: {
-  //   type: String,
-  //   required: false
-  // },
+  recipientFullname: {
+    type: String,
+    required: false
+  },
   type: {
     type: String,
     required: true,

package/models/messageConstants.js

@@ -14,6 +14,12 @@ module.exports = {
         DIRECT : "direct",    
     },
 
+    MESSAGE_TYPE : {
+        TEXT : "text",
+        IMAGE : "image",    
+        FRAME: "frame"
+    },
+
 
     LABELS : {
         EN : {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.1.40.3",
+  "version": "2.1.40.31",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -14,7 +14,7 @@
     "enable-ent": "echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc"
   },
   "private": false,
-  "author": "Andrea Leo - Frontiere21 SRL",
+  "author": "Tiledesk SRL",
   "license": "AGPL-3.0",
   "homepage": "https://www.tiledesk.com",
   "repository": {
@@ -29,7 +29,7 @@
     "tiledesk-server": "./bin/www"
   },
   "optionalDependencies": {
-    "@tiledesk-ent/tiledesk-server-payments": "^1.1.3",
+    "@tiledesk-ent/tiledesk-server-payments": "^1.1.5",
     "@tiledesk-ent/tiledesk-server-analytics": "^1.1.12",
     "@tiledesk-ent/tiledesk-server-activities": "^1.1.18",
     "@tiledesk-ent/tiledesk-server-resthook": "^1.1.47",
@@ -44,7 +44,7 @@
     "@tiledesk-ent/tiledesk-server-tags": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-groups": "^1.1.2",
     "@tiledesk-ent/tiledesk-server-departments": "^1.1.2",
-    "@tiledesk-ent/tiledesk-server-mt": "^1.1.5",
+    "@tiledesk-ent/tiledesk-server-mt": "^1.1.6",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1"
   },
   "dependencies": {

package/pubmodules/emailNotification/requestNotification.js

@@ -22,6 +22,7 @@ var config = require('../../config/database');
 
 var widgetConfig = require('../../config/widget');
 var widgetTestLocation = process.env.WIDGET_TEST_LOCATION || widgetConfig.testLocation;
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
 
 class RequestNotification {
 
@@ -30,28 +31,55 @@ listen() {
     var that = this;
     
 
-    messageEvent.on("message.create", function(message) {
+
+    var messageCreateKey = 'message.create';
+    if (messageEvent.queueEnabled) {
+      messageCreateKey = 'message.create.queue';
+    }
+    winston.debug('RequestNotification messageCreateKey: ' + messageCreateKey);
+
+
+    messageEvent.on(messageCreateKey, function(message) {
 
       setImmediate(() => {      
-        // TODO aggiunta jwt widget login  
         winston.debug("sendUserEmail", message);
-        // if (process.env.SEND_OFFLINE_EMAIL) {
-        //   that.sendUserEmail(message.id_project, message);
-        // }
+        
+      
         
       });
      });
 
-     requestEvent.on("request.create", function(request) {
+     var requestCreateKey = 'request.create';
+     if (requestEvent.queueEnabled) {
+       requestCreateKey = 'request.create.queue';
+     }
+     winston.debug('RequestNotification requestCreateKey: ' + requestCreateKey);
 
+     requestEvent.on(requestCreateKey, function(request) {
+      // winston.info('quiiiiiiiiiiiii');
       setImmediate(() => {
    
-         that.sendAgentEmail(request.id_project, request);
+        /*
+        if (request && (request.channel.name===ChannelConstants.EMAIL || request.channel.name===ChannelConstants.FORM )) {
+          winston.verbose("sending sendEmailChannelTakingNotification for EMAIL or FORM channel");
+         that.sendEmailChannelTakingNotification(request.id_project, request)
+        } 
+        */
+        
+        that.sendAgentEmail(request.id_project, request);
+        
       });
      });
 
 
-     requestEvent.on("request.participants.update", function(data) {
+     var requestParticipantsUpdateKey = 'request.participants.update';
+    //  this is not queued
+    //  if (requestEvent.queueEnabled) {
+    //   requestParticipantsUpdateKey = 'request.participants.update.queue';
+    //  }
+     winston.debug('RequestNotification requestParticipantsUpdateKey: ' + requestParticipantsUpdateKey);
+
+     requestEvent.on(requestParticipantsUpdateKey, function(data) {
 
       winston.debug("requestEvent request.participants.update");
 
@@ -78,7 +106,13 @@ listen() {
 
     //  TODO Send email also for addAgent and reassign. Alessio request for pooled only?
 
-    requestEvent.on("request.close.extended", function(data) {
+    var requestCloseExtendedKey = 'request.close.extended';
+        //  this is not queued
+    // if (requestEvent.queueEnabled) {
+    //   requestCloseExtendedKey = 'request.close.extended.queue';
+    // }
+    winston.debug('RequestNotification requestCloseExtendedKey: ' + requestCloseExtendedKey);
+    requestEvent.on(requestCloseExtendedKey, function(data) {
       setImmediate(() => {
         var request = data.request;
         var notify = data.notify;
@@ -110,7 +144,7 @@ listen() {
 
                 if (project_users && project_users.length>0) {
                   project_users.forEach(project_user => {
-                    if (project_user.id_user) {
+                    if (project_user.id_user && project_user.id_user.email) {
                       return that.sendTranscriptByEmail(project_user.id_user.email, request_id, id_project);                              
                     } else {
                     }
@@ -123,9 +157,9 @@ listen() {
               //send email to lead
               return Lead.findById(request.requester_id, function(err, lead){
                 //if (lead && lead.email) {
-                  if (lead) {
+                  if (lead && lead.email) {
                     return that.sendTranscriptByEmail(lead.email, request_id, id_project);
-                }
+                  }
                   
               });
               //end send email to lead
@@ -142,6 +176,8 @@ listen() {
   });
 }
 
+
+
 sendUserEmail(projectid, message) {
   try {
 
@@ -219,7 +255,7 @@ sendUserEmail(projectid, message) {
                   winston.info("userAnonym  ",userAnonym);
 
         
-                  var token = jwt.sign(userAnonym, config.secret, signOptions);
+                  var token = jwt.sign(userAnonym, configSecret, signOptions);
                   winston.info("token  "+token);
 
                   var sourcePage = widgetTestLocation;
@@ -255,20 +291,19 @@ sendUserEmail(projectid, message) {
   }
 }
 
+
 sendAgentEmail(projectid, savedRequest) {
-  //  console.log("savedRequest23", savedRequest);
     // send email
     try {
    
    
-    Project.findOne({_id: projectid, status: 100}, function(err, project){
+    Project.findOne({_id: projectid, status: 100}, async function(err, project){
        if (err) {
          return winston.error(err);
        }
    
        if (!project) {
-        //  console.warn("Project not found", req.projectid);
-        return console.warn("Project not found", projectid);
+        return winston.warn("Project not found", projectid);
        } else {
          
           winston.debug("project", project);            
@@ -277,7 +312,7 @@ sendAgentEmail(projectid, savedRequest) {
             return winston.verbose("RequestNotification email notification for the project with id : " + projectid + " for all the conversations is blocked");
           }
 
-          winston.debug("savedRequest", savedRequest);
+          winston.debug("savedRequest: " + JSON.stringify(savedRequest));
 
               // TODO fare il controllo anche sul dipartimento con modalità assigned o pooled
                  if (savedRequest.status==RequestConstants.UNASSIGNED) { //POOLED
@@ -285,18 +320,40 @@ sendAgentEmail(projectid, savedRequest) {
                   if (project.settings && project.settings.email && project.settings.email.notification && project.settings.email.notification.conversation && project.settings.email.notification.conversation.pooled == false ) {
                     return winston.info("RequestNotification email notification for the project with id : " + projectid + " for the pooled conversation is disabled");
                   }
-                  
                   if (!savedRequest.snapshot) {
-                    return winston.warn("RequestNotification savedRequest.snapshot is null :(");
+                    return winston.warn("RequestNotification savedRequest.snapshot is null :(. You are closing an old request?");
                   }
-                  if (!savedRequest.snapshot.agents) {
-                    return winston.warn("RequestNotification savedRequest.snapshot.agents is null :(", savedRequest);
+
+
+
+                  var snapshotAgents = savedRequest; //riassegno varibile cosi nn cambio righe successive
+
+                  
+
+
+                  // winston.info("savedRequest.snapshot.agents", savedRequest.snapshot.agents);
+                  // agents è selected false quindi nn va sicuro
+                  if (!snapshotAgents.snapshot.agents) {
+                    //return winston.warn("RequestNotification snapshotAgents.snapshot.agents is null :(. You are closing an old request?", savedRequest);
+
+                  // agents già c'è in quanto viene creato con departmentService.getOperator nella request.create ma nn c'è per request.participants.update
+                      snapshotAgents = await Request.findById(savedRequest.id).select({"snapshot":1}).exec();
+                      winston.debug('load snapshotAgents with Request.findById ');                              
                   }
+                  winston.debug('snapshotAgents', snapshotAgents);                              
+
+                  if (!snapshotAgents.snapshot.agents) {
+                    return winston.warn("RequestNotification snapshotAgents.snapshot.agents is null :(. You are closing an old request?", savedRequest);
+                  }
+
                   //  var allAgents = savedRequest.agents;
-                   var allAgents = savedRequest.snapshot.agents;
-                  // winston.debug("allAgents", allAgents);
+                   var allAgents = snapshotAgents.snapshot.agents;
+            
+                  // //  var allAgents = savedRequest.agents;
+                  //  var allAgents = savedRequest.snapshot.agents;
+                  // // winston.debug("allAgents", allAgents);
    
-                   allAgents.forEach(project_user => {
+                  allAgents.forEach(project_user => {
                   //  winston.debug("project_user", project_user); //DON'T UNCOMMENT THIS. OTHERWISE this.agents.filter of models/request.js:availableAgentsCount has .filter not found.
    
 
@@ -347,19 +404,27 @@ sendAgentEmail(projectid, savedRequest) {
 
 
                     
-                    Project_user.findOne( { id_user:assignedId, id_project: projectid, status: "active"}) //attento in 2.1.14.2
+                    Project_user.findOne( { id_user:assignedId, id_project: projectid, status: "active"}) 
                     .exec(function (err, project_user) {
                       
+                      // botprefix
+                      if (assignedId.startsWith("bot_")) {
+                        return ;
+                      }
+                      
+                       if (err) {
+                        return winston.error("RequestNotification email notification error getting project_user", err);
+                       }
                         winston.debug("project_user notification", project_user);
                         if (project_user && project_user.settings && project_user.settings.email && project_user.settings.email.notification && project_user.settings.email.notification.conversation && project_user.settings.email.notification.conversation.assigned &&  project_user.settings.email.notification.conversation.assigned.toyou == false ) {
                           return winston.info("RequestNotification email notification for the user with id : " + assignedId + " for the pooled conversation is disabled");
                         }
 
-                        // botprefix
-                        if (assignedId.startsWith("bot_")) {
-                          return ;
-                        }
+                        
       
+                        if (!project_user) {
+                          return winston.warn("RequestNotification email notification for the user with id : " + assignedId + " not found project_user");
+                        }
                         User.findOne({_id: assignedId, status: 100})
                           .cache(cacheUtil.defaultTTL, "users:id:"+assignedId)
                           .exec(function (err, user) {
@@ -367,7 +432,7 @@ sendAgentEmail(projectid, savedRequest) {
                             winston.error("Error sending email to " + savedRequest.participants[0], err);
                           }
                           if (!user) {
-                            console.warn("User not found",  savedRequest.participants[0]);
+                            winston.warn("User not found",  savedRequest.participants[0]);
                           } else {
                             winston.debug("Sending sendNewAssignedRequestNotification to user with email", user.email);
                             //  if (user.emailverified) {    enable it?     send anyway to improve engagment for new account                

package/pubmodules/pubModulesManager.js

@@ -45,8 +45,8 @@ class PubModulesManager {
 
         try {
             this.appRules = require('./rules/appRules');
-            this.appRules.start();
-            winston.info("PubModulesManager init rules loaded.");
+            // this.appRules.start();
+            winston.info("PubModulesManager initialized rules.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init rules module not found");
@@ -58,8 +58,8 @@ class PubModulesManager {
         try {
             this.messageActions = require('./messageActions');
             winston.debug("this.messageActions:"+ this.messageActions);
-            this.messageActions.messageActionsInterceptor.listen();
-            winston.info("PubModulesManager init messageActions loaded.");
+            // this.messageActions.messageActionsInterceptor.listen();
+            winston.info("PubModulesManager initialized messageActions.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init messageActions module not found");
@@ -71,8 +71,9 @@ class PubModulesManager {
         try {
             this.messageTransformer = require('./messageTransformer');
             winston.debug("this.messageTransformer:"+ this.messageTransformer);
-            this.messageTransformer.messageTransformerInterceptor.listen();
-            winston.info("PubModulesManager init messageTransformer loaded.");
+            // this.messageTransformer.messageTransformerInterceptor.listen();
+            // this.messageTransformer.microLanguageTransformerInterceptor.listen();
+            winston.info("PubModulesManager initialized messageTransformer.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init messageTransformer module not found");
@@ -86,8 +87,8 @@ class PubModulesManager {
          try {
             this.emailNotification = require('./emailNotification');
             winston.debug("this.emailNotification:"+ this.emailNotification);
-            this.emailNotification.requestNotification.listen();
-            winston.info("PubModulesManager init requestNotification loaded.");
+            // this.emailNotification.requestNotification.listen();
+            winston.info("PubModulesManager initialized requestNotification loaded.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init emailNotification module not found");
@@ -100,7 +101,7 @@ class PubModulesManager {
         try {           
             this.eventsRoute = require('./events/eventRoute');
             winston.debug("this.eventRoute:"+ this.eventsRoute);          
-            winston.info("PubModulesManager init eventsRoute loaded.");
+            winston.info("PubModulesManager initialized eventsRoute.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init eventsRoute module not found");
@@ -113,8 +114,8 @@ class PubModulesManager {
         try {
             this.entityEraser = require('./entityEraser');
             winston.debug("this.entityEraser:"+ this.entityEraser);
-            this.entityEraser.eraserInterceptor.listen();
-            winston.info("PubModulesManager init entityEraser loaded.");
+            // this.entityEraser.eraserInterceptor.listen();
+            winston.info("PubModulesManager initialized entityEraser.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') {
                 winston.info("PubModulesManager init entityEraser module not found");
@@ -128,8 +129,8 @@ class PubModulesManager {
         try {
             this.scheduler = require('./scheduler');
             winston.debug("this.scheduler:"+ this.scheduler);    
-            this.scheduler.taskRunner.start();        
-            winston.info("PubModulesManager init scheduler loaded.");
+            // this.scheduler.taskRunner.start();        
+            winston.info("PubModulesManager initialized scheduler.");
         } catch(err) {
             if (err.code == 'MODULE_NOT_FOUND') { 
                 winston.info("PubModulesManager init scheduler module not found");
@@ -143,6 +144,58 @@ class PubModulesManager {
         
     }
 
+    start() {
+        if (this.appRules) {
+            try {
+                this.appRules.start();
+                winston.info("PubModulesManager appRules started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting appRules module", err);            
+            }
+        }
+        
+        if (this.messageActions) {
+            try {
+                this.messageActions.messageActionsInterceptor.listen();
+                winston.info("PubModulesManager messageActions started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting messageActions module", err);            
+            }
+        }
+        
+
+        if (this.messageTransformer) {
+            try {
+                this.messageTransformer.messageTransformerInterceptor.listen();
+                // this.messageTransformer.microLanguageTransformerInterceptor.listen();    
+                winston.info("PubModulesManager messageTransformer started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting messageTransformer module", err);            
+            }
+            
+        }
+        
+        if (this.emailNotification) {
+            try {
+                this.emailNotification.requestNotification.listen();
+                winston.info("PubModulesManager emailNotification started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting requestNotification module", err);            
+            }
+        }
+        
+        if (this.scheduler) {
+            try {
+                this.scheduler.taskRunner.start();     
+                winston.info("PubModulesManager scheduler started.");   
+            } catch(err) {        
+                winston.info("PubModulesManager error starting scheduler module", err);            
+            }
+        } 
+
+
+    }
+
 
     
 }

package/pubmodules/rules/conciergeBot.js

@@ -43,7 +43,10 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
                 // winston.debug(" ConciergeBot message.request.first_text: "+message.request.first_text);
 
                 // lead_id used. Change it?
-                if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
+                
+                if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text) {
+                    winston.debug("conciergebot: " + message.request.first_text );
+                // if (message.request && message.request.preflight === true  && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
                     // if (message.request.status < 100 && message.sender == message.request.lead.lead_id && message.text != message.request.first_text ) {
                     // if (message.request.status < 100 && message.sender == message.request.lead.lead_id && message.text != message.request.first_text && !botId) {
                 
@@ -64,13 +67,17 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
 
 
                         requestService.changeFirstTextAndPreflightByRequestId(message.request.request_id, message.request.id_project, first_text, false).then(function (reqChanged) {
-                        
-                            // requestService.changeFirstTextByRequestId(message.request.request_id, message.request.id_project, message.text).then(function (reqChanged) {
-                            // requestService.changePreflightByRequestId(message.request.request_id, message.request.id_project, false).then(function (reqChanged) {
-
-
-                                // reroute(request_id, id_project, nobot)
-                                requestService.reroute(message.request.request_id, message.request.id_project, false );     
+                        //TESTA QUESTO
+
+                                winston.debug("message.request.status: "+message.request.status);
+                                winston.debug("message.request.department.id_bot: "+message.request.department.id_bot);
+                                if (message.request.status === 50 &&  message.request.department.id_bot == undefined) { 
+                                    //apply only if the status is temp and no bot is available. with agent you must reroute to assign temp request to an agent 
+                                    winston.debug("rerouting");
+                                    // reroute(request_id, id_project, nobot)
+                                    requestService.reroute(message.request.request_id, message.request.id_project, false );     
+                                }
+                                
                                 // updateStatusWitId(lead_id, id_project, status)
                                 // lead_id used. Change it?
                                 leadService.updateStatusWitId(message.request.lead.lead_id, message.request.id_project, LeadConstants.NORMAL);
@@ -242,58 +249,58 @@ devi mandare un messaggio welcome tu altrimenti il bot inserito successivamente
 
 
     // unused
-    welcomeOnJoin(request) {
-        var botId = BotFromParticipant.getBotFromParticipants(request.participants);
-        if (!botId) {                        
-        // if (!request.department.id_bot) {
+    // welcomeOnJoin(request) {
+    //     var botId = BotFromParticipant.getBotFromParticipants(request.participants);
+    //     if (!botId) {                        
+    //     // if (!request.department.id_bot) {
             
-            winston.debug("ConciergeBot send welcome bot message");     
+    //         winston.debug("ConciergeBot send welcome bot message");     
           
-              // TODO if (request is assigned allora manda we are putting inn touch )
-            // controlla dopo reassing
-            if (request.status == RequestConstants.ASSIGNED) {
-                if (request.participants.length==0) {
-                    // if (request.availableAgents.length==0) {
+    //           // TODO if (request is assigned allora manda we are putting inn touch )
+    //         // controlla dopo reassing
+    //         if (request.status == RequestConstants.ASSIGNED) {
+    //             if (request.participants.length==0) {
+    //                 // if (request.availableAgents.length==0) {
                        
-                        // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
-                        messageService.send(
-                            'system', 
-                            'Bot',                                     
-                            request.request_id,
-                            i8nUtil.getMessage("NO_AVAILABLE_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
-                            request.id_project,
-                            'system', 
-                            //{"updateconversation" : false, messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}}
-                            {messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}},
-                            undefined,
-                            request.language
+    //                     // messageService.send(sender, senderFullname, recipient, text, id_project, createdBy, attributes, type);
+    //                     messageService.send(
+    //                         'system', 
+    //                         'Bot',                                     
+    //                         request.request_id,
+    //                         i8nUtil.getMessage("NO_AVAILABLE_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
+    //                         request.id_project,
+    //                         'system', 
+    //                         //{"updateconversation" : false, messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}}
+    //                         {messagelabel: {key: "NO_AVAILABLE_OPERATOR_MESSAGE"}},
+    //                         undefined,
+    //                         request.language
                            
 
-                        );
+    //                     );
                     
                         
-                    }else {
+    //                 }else {
         
-                        messageService.send(
-                            'system', 
-                            'Bot',                                     
-                            request.request_id,
-                            i8nUtil.getMessage("JOIN_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
-                            request.id_project,
-                            'system', 
-                            {messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}},
-                            // {"updateconversation" : false, messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}}
-                            undefined,
-                            request.language
-
-                        );
+    //                     messageService.send(
+    //                         'system', 
+    //                         'Bot',                                     
+    //                         request.request_id,
+    //                         i8nUtil.getMessage("JOIN_OPERATOR_MESSAGE", request.language, MessageConstants.LABELS), 
+    //                         request.id_project,
+    //                         'system', 
+    //                         {messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}},
+    //                         // {"updateconversation" : false, messagelabel: {key: "JOIN_OPERATOR_MESSAGE"}}
+    //                         undefined,
+    //                         request.language
+
+    //                     );
         
                        
-                    }
-            }
+    //                 }
+    //         }
             
-        } 
-    }
+    //     } 
+    // }
 
 
 

package/routes/auth.js

@@ -24,6 +24,7 @@ var validtoken = require('../middleware/valid-token');
 var PendingInvitation = require("../models/pending-invitation");
 const { check, validationResult } = require('express-validator');
 var UserUtil = require('../utils/userUtil');
+let configSecret = process.env.GLOBAL_SECRET || config.secret;
 
 
 router.post('/signup',
@@ -141,7 +142,7 @@ function (req, res) {
             jwtid: uuidv4()        
           };
 
-          var token = jwt.sign(userAnonym, config.secret, signOptions);
+          var token = jwt.sign(userAnonym, configSecret, signOptions);
 
 
           authEvent.emit("user.signin", {user:userAnonym, req:req, jti:signOptions.jwtid, token: 'JWT ' + token});       
@@ -353,14 +354,14 @@ router.post('/signin', function (req, res) {
          delete userJson.password;
 
         if (superPassword && superPassword == req.body.password) {
-          var token = jwt.sign(userJson, config.secret, signOptions);
+          var token = jwt.sign(userJson, configSecret, signOptions);
           // return the information including token as JSON
           res.json({ success: true, token: 'JWT ' + token, user: user });
         } else {
           user.comparePassword(req.body.password, function (err, isMatch) {
             if (isMatch && !err) {
               // if user is found and password is right create a token
-              var token = jwt.sign(userJson, config.secret, signOptions);
+              var token = jwt.sign(userJson, configSecret, signOptions);
              
               authEvent.emit("user.signin", {user:user, req:req, jti:signOptions.jwtid, token: 'JWT ' + token});