@tiledesk/tiledesk-server 2.4.3 → 2.4.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.4.3",
+  "version": "2.4.5",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -30,7 +30,7 @@
   },
   "optionalDependencies": {
     "@tiledesk-ent/tiledesk-server-jwthistory": "^1.1.9",
-    "@tiledesk-ent/tiledesk-server-payments": "^1.1.11",
+    "@tiledesk-ent/tiledesk-server-payments": "^1.1.12",
     "@tiledesk-ent/tiledesk-server-request-history": "^1.1.5",
     "@tiledesk-ent/tiledesk-server-visitorcounter": "^1.1.1",
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"

package/pubmodules/emailNotification/requestNotification.js

@@ -49,6 +49,8 @@ class RequestNotification {
 }
 
 listen() {
+
+  winston.debug("RequestNotification listen");
     var that = this; 
     
 
@@ -207,7 +209,8 @@ listen() {
 
             if (project && project.settings && project.settings.email && 
               project.settings.email.autoSendTranscriptToRequester &&  
-              project.settings.email.autoSendTranscriptToRequester === true && 
+              project.settings.email.autoSendTranscriptToRequester === true 
+              && 
               project.profile && 
               (
                 (project.profile.type === 'free' && project.trialExpired === false) || 
@@ -231,7 +234,7 @@ listen() {
 
               });
               //end send email to admin
-
+              winston.debug('Lead.findById ');
               //send email to lead
               return Lead.findById(request.requester_id, function(err, lead){
                 //if (lead && lead.email) {

package/pubmodules/pubModulesManager.js

@@ -279,7 +279,7 @@ class PubModulesManager {
 
         try {
             this.messenger = require('./messenger');
-            winston.info("this.messenger: " + this.messenger);
+            winston.debug("this.messenger: " + this.messenger);
             this.messenger.listener.listen(config);
 
             this.messengerRoute = this.messenger.messengerRoute;

package/pubmodules/trigger/rulesTrigger.js

@@ -261,14 +261,14 @@ class RulesTrigger {
 
               //custom ocf here
                                                   //prod                                                          //pre
-              if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6" || eventTrigger.event.id_project == "642c609f179910002cc56b3e") {
-                // subject = "Richiesta di supporto #" + eventTrigger.event.ticket_id;
-                subject = "Segnalazione #" + eventTrigger.event.ticket_id;
-                if (eventTrigger.event.subject) {
-                  subject = subject + " - " + eventTrigger.event.subject;
-                } 
-                // console.log("subject",subject);
-              }
+              // if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6" || eventTrigger.event.id_project == "642c609f179910002cc56b3e") {
+              //   // subject = "Richiesta di supporto #" + eventTrigger.event.ticket_id;
+              //   subject = "Segnalazione #" + eventTrigger.event.ticket_id;
+              //   if (eventTrigger.event.subject) {
+              //     subject = subject + " - " + eventTrigger.event.subject;
+              //   } 
+              //   // console.log("subject",subject);
+              // }
 
             }
             if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {

package/routes/email.js

@@ -322,8 +322,8 @@ router.post('/send',
   let newto = await recipientEmailUtil.process(to, req.projectid);
   winston.debug("newto: " + newto);
 
-             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage)
-  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined);
+             //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
+  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined);
   
   res.json({"queued": true});
     

package/services/emailService.js

@@ -1457,7 +1457,7 @@ class EmailService {
 
 
   
-async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
+async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload) {
 
   var that = this;
 
@@ -1499,7 +1499,8 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     seamlessPage: sourcePage,
     msgText: msgText,
     tokenQueryString: tokenQueryString,
-    baseScope: baseScope    
+    baseScope: baseScope,
+    payload: payload
   };
 
   var html = template(replacements);
@@ -1524,6 +1525,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     }
   }
 
+  let subjectParsed = that.parseText(subject, payload);
 
   // if (message.request && message.request.lead && message.request.lead.email) {
   //   winston.info("message.request.lead.email: " + message.request.lead.email);
@@ -1538,7 +1540,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
     from:from, 
     to:to, 
     replyTo: replyTo, 
-    subject:subject,
+    subject:subjectParsed,
     text:html, 
     html:html,
     config:configEmail, 
@@ -1848,6 +1850,31 @@ async sendRequestTranscript(to, messages, request, project) {
 
 }
 
+parseText(text, payload) {
+
+ 
+
+  var baseScope = JSON.parse(JSON.stringify(this));
+  delete baseScope.pass;
+
+  winston.info("parseText text: "+ text);
+
+  var templateHand = handlebars.compile(text);
+
+  var replacements = {        
+    payload: payload,  
+    baseScope: baseScope,
+    test: "test"
+  };
+
+  var textTemplate = templateHand(replacements);
+  winston.info("parseText textTemplate: "+ textTemplate);
+
+  return textTemplate;
+
+
+}
+
 formatText(templateName, defaultText, payload, settings) {
 
   let text = defaultText;
@@ -1887,8 +1914,8 @@ getTemplate(templateName, settings) {
     winston.verbose('getTemplate formatSubject: ' + JSON.stringify(settings)); 
     
 
-    winston.verbose('getTemplate settings.email.templates: ',settings.email.templates); 
       if (settings && settings.email && settings.email.templates) {
+        winston.verbose('getTemplate settings.email.templates: ',settings.email.templates); 
 
        var templates = settings.email.templates;
        winston.verbose('getTemplate templates: ',templates); 

package/utils/sendEmailUtil.js

@@ -23,9 +23,9 @@ class SendEmailUtil {
         winston.debug("finaltext:" + finaltext);
 
 
-        // sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
-        emailService.sendEmailDirect(to, finaltext, project, recipient, subject, undefined, undefined);
-        // emailService.sendEmailDirect(to, text, project, recipient, subject, undefined, undefined);
+        // sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload) {
+        emailService.sendEmailDirect(to, finaltext, project, recipient, subject, undefined, undefined, message);
+        
     }
 }