@tiledesk/tiledesk-server 2.4.4 → 2.4.5
Sign up to get free protection for your applications and to get access to all the features.
package/package.json
CHANGED
@@ -49,6 +49,8 @@ class RequestNotification {
|
|
49
49
|
}
|
50
50
|
|
51
51
|
listen() {
|
52
|
+
|
53
|
+
winston.debug("RequestNotification listen");
|
52
54
|
var that = this;
|
53
55
|
|
54
56
|
|
@@ -207,7 +209,8 @@ listen() {
|
|
207
209
|
|
208
210
|
if (project && project.settings && project.settings.email &&
|
209
211
|
project.settings.email.autoSendTranscriptToRequester &&
|
210
|
-
project.settings.email.autoSendTranscriptToRequester === true
|
212
|
+
project.settings.email.autoSendTranscriptToRequester === true
|
213
|
+
&&
|
211
214
|
project.profile &&
|
212
215
|
(
|
213
216
|
(project.profile.type === 'free' && project.trialExpired === false) ||
|
@@ -231,7 +234,7 @@ listen() {
|
|
231
234
|
|
232
235
|
});
|
233
236
|
//end send email to admin
|
234
|
-
|
237
|
+
winston.debug('Lead.findById ');
|
235
238
|
//send email to lead
|
236
239
|
return Lead.findById(request.requester_id, function(err, lead){
|
237
240
|
//if (lead && lead.email) {
|
@@ -261,14 +261,14 @@ class RulesTrigger {
|
|
261
261
|
|
262
262
|
//custom ocf here
|
263
263
|
//prod //pre
|
264
|
-
if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6" || eventTrigger.event.id_project == "642c609f179910002cc56b3e") {
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
|
271
|
-
}
|
264
|
+
// if (eventTrigger.event.id_project =="6406e34727b57500120b1bd6" || eventTrigger.event.id_project == "642c609f179910002cc56b3e") {
|
265
|
+
// // subject = "Richiesta di supporto #" + eventTrigger.event.ticket_id;
|
266
|
+
// subject = "Segnalazione #" + eventTrigger.event.ticket_id;
|
267
|
+
// if (eventTrigger.event.subject) {
|
268
|
+
// subject = subject + " - " + eventTrigger.event.subject;
|
269
|
+
// }
|
270
|
+
// // console.log("subject",subject);
|
271
|
+
// }
|
272
272
|
|
273
273
|
}
|
274
274
|
if (eventTrigger.eventKey=="message.create.from.requester" || eventTrigger.eventKey=="message.received") {
|
package/routes/email.js
CHANGED
@@ -322,8 +322,8 @@ router.post('/send',
|
|
322
322
|
let newto = await recipientEmailUtil.process(to, req.projectid);
|
323
323
|
winston.debug("newto: " + newto);
|
324
324
|
|
325
|
-
//sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage)
|
326
|
-
emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined);
|
325
|
+
//sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload)
|
326
|
+
emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined, undefined);
|
327
327
|
|
328
328
|
res.json({"queued": true});
|
329
329
|
|
package/services/emailService.js
CHANGED
@@ -1457,7 +1457,7 @@ class EmailService {
|
|
1457
1457
|
|
1458
1458
|
|
1459
1459
|
|
1460
|
-
async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
|
1460
|
+
async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload) {
|
1461
1461
|
|
1462
1462
|
var that = this;
|
1463
1463
|
|
@@ -1499,7 +1499,8 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
|
|
1499
1499
|
seamlessPage: sourcePage,
|
1500
1500
|
msgText: msgText,
|
1501
1501
|
tokenQueryString: tokenQueryString,
|
1502
|
-
baseScope: baseScope
|
1502
|
+
baseScope: baseScope,
|
1503
|
+
payload: payload
|
1503
1504
|
};
|
1504
1505
|
|
1505
1506
|
var html = template(replacements);
|
@@ -1524,6 +1525,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
|
|
1524
1525
|
}
|
1525
1526
|
}
|
1526
1527
|
|
1528
|
+
let subjectParsed = that.parseText(subject, payload);
|
1527
1529
|
|
1528
1530
|
// if (message.request && message.request.lead && message.request.lead.email) {
|
1529
1531
|
// winston.info("message.request.lead.email: " + message.request.lead.email);
|
@@ -1538,7 +1540,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
|
|
1538
1540
|
from:from,
|
1539
1541
|
to:to,
|
1540
1542
|
replyTo: replyTo,
|
1541
|
-
subject:
|
1543
|
+
subject:subjectParsed,
|
1542
1544
|
text:html,
|
1543
1545
|
html:html,
|
1544
1546
|
config:configEmail,
|
@@ -1848,6 +1850,31 @@ async sendRequestTranscript(to, messages, request, project) {
|
|
1848
1850
|
|
1849
1851
|
}
|
1850
1852
|
|
1853
|
+
parseText(text, payload) {
|
1854
|
+
|
1855
|
+
|
1856
|
+
|
1857
|
+
var baseScope = JSON.parse(JSON.stringify(this));
|
1858
|
+
delete baseScope.pass;
|
1859
|
+
|
1860
|
+
winston.info("parseText text: "+ text);
|
1861
|
+
|
1862
|
+
var templateHand = handlebars.compile(text);
|
1863
|
+
|
1864
|
+
var replacements = {
|
1865
|
+
payload: payload,
|
1866
|
+
baseScope: baseScope,
|
1867
|
+
test: "test"
|
1868
|
+
};
|
1869
|
+
|
1870
|
+
var textTemplate = templateHand(replacements);
|
1871
|
+
winston.info("parseText textTemplate: "+ textTemplate);
|
1872
|
+
|
1873
|
+
return textTemplate;
|
1874
|
+
|
1875
|
+
|
1876
|
+
}
|
1877
|
+
|
1851
1878
|
formatText(templateName, defaultText, payload, settings) {
|
1852
1879
|
|
1853
1880
|
let text = defaultText;
|
@@ -1887,8 +1914,8 @@ getTemplate(templateName, settings) {
|
|
1887
1914
|
winston.verbose('getTemplate formatSubject: ' + JSON.stringify(settings));
|
1888
1915
|
|
1889
1916
|
|
1890
|
-
winston.verbose('getTemplate settings.email.templates: ',settings.email.templates);
|
1891
1917
|
if (settings && settings.email && settings.email.templates) {
|
1918
|
+
winston.verbose('getTemplate settings.email.templates: ',settings.email.templates);
|
1892
1919
|
|
1893
1920
|
var templates = settings.email.templates;
|
1894
1921
|
winston.verbose('getTemplate templates: ',templates);
|
package/utils/sendEmailUtil.js
CHANGED
@@ -23,9 +23,9 @@ class SendEmailUtil {
|
|
23
23
|
winston.debug("finaltext:" + finaltext);
|
24
24
|
|
25
25
|
|
26
|
-
// sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage) {
|
27
|
-
emailService.sendEmailDirect(to, finaltext, project, recipient, subject, undefined, undefined);
|
28
|
-
|
26
|
+
// sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage, payload) {
|
27
|
+
emailService.sendEmailDirect(to, finaltext, project, recipient, subject, undefined, undefined, message);
|
28
|
+
|
29
29
|
}
|
30
30
|
}
|
31
31
|
|