@tiledesk/tiledesk-server 2.3.34 → 2.3.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -3
- package/app.js +2 -0
- package/package.json +1 -1
- package/routes/users-util.js +31 -0
- package/services/emailService.js +13 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
|
|
2
|
-
💥 TILEDESK SERVER v2.3.
|
|
2
|
+
💥 TILEDESK SERVER v2.3.35 💥
|
|
3
3
|
🚀 TAGGED AND PUBLISHED ON NPM 🚀
|
|
4
4
|
🚀 IN PRODUCTION 🚀
|
|
5
|
-
(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.
|
|
5
|
+
(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.35)
|
|
6
6
|
|
|
7
|
-
# 2.3.
|
|
7
|
+
# 2.3.35
|
|
8
|
+
- Added user util endpoint for contact lookup from chat21
|
|
9
|
+
|
|
10
|
+
# 2.3.34
|
|
8
11
|
- aqmp depenency fix
|
|
9
12
|
|
|
10
13
|
# 2.3.32
|
package/app.js
CHANGED
|
@@ -101,6 +101,7 @@ var project_users_test = require('./routes/project_user_test');
|
|
|
101
101
|
var request = require('./routes/request');
|
|
102
102
|
// var setting = require('./routes/setting');
|
|
103
103
|
var users = require('./routes/users');
|
|
104
|
+
var usersUtil = require('./routes/users-util');
|
|
104
105
|
var publicRequest = require('./routes/public-request');
|
|
105
106
|
var userRequest = require('./routes/user-request');
|
|
106
107
|
var publicAnalytics = require('./routes/public-analytics');
|
|
@@ -377,6 +378,7 @@ app.use('/images', images);
|
|
|
377
378
|
app.use('/files', files);
|
|
378
379
|
app.use('/urls', urls);
|
|
379
380
|
app.use('/users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], users);
|
|
381
|
+
app.use('/users_util', usersUtil);
|
|
380
382
|
app.use('/logs', logs);
|
|
381
383
|
app.use('/requests_util', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], requestUtilRoot);
|
|
382
384
|
|
package/package.json
CHANGED
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
var express = require('express');
|
|
2
|
+
var router = express.Router();
|
|
3
|
+
|
|
4
|
+
var User = require("../models/user");
|
|
5
|
+
var winston = require('../config/winston');
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
// sponz: realizza mini servizio senza sec
|
|
12
|
+
router.get('/:userid', function (req, res) {
|
|
13
|
+
winston.debug("users");
|
|
14
|
+
var userid = req.params.userid;
|
|
15
|
+
|
|
16
|
+
User.findById(userid, 'firstname lastname _id', function (err, user) {
|
|
17
|
+
if (err) {
|
|
18
|
+
winston.error('Error getting object.',err);
|
|
19
|
+
return res.status(500).send({ success: false, msg: 'Error getting object.' });
|
|
20
|
+
}
|
|
21
|
+
if (!user) {
|
|
22
|
+
winston.warn("Object not found with id " +req.user.id);
|
|
23
|
+
return res.status(404).send({ success: false, msg: 'Object not found.' });
|
|
24
|
+
}
|
|
25
|
+
winston.debug("GET USER BY ID RES JSON", user);
|
|
26
|
+
res.json(user);
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
module.exports = router;
|
package/services/emailService.js
CHANGED
|
@@ -98,7 +98,11 @@ class EmailService {
|
|
|
98
98
|
this.host = process.env.EMAIL_HOST || config.host;
|
|
99
99
|
winston.info('EmailService host: ' + this.host);
|
|
100
100
|
|
|
101
|
-
this.secure =
|
|
101
|
+
this.secure = false;
|
|
102
|
+
if (process.env.EMAIL_SECURE == "true" || process.env.EMAIL_SECURE ==true) {
|
|
103
|
+
this.secure = true;
|
|
104
|
+
}
|
|
105
|
+
// this.secure = process.env.EMAIL_SECURE || false;
|
|
102
106
|
winston.info('EmailService secure: ' + this.secure);
|
|
103
107
|
|
|
104
108
|
this.user = process.env.EMAIL_USERNAME || config.username;
|
|
@@ -108,7 +112,11 @@ class EmailService {
|
|
|
108
112
|
winston.info('EmailService port: ' + this.port);
|
|
109
113
|
|
|
110
114
|
|
|
111
|
-
this.markdown =
|
|
115
|
+
this.markdown = true;
|
|
116
|
+
if (process.env.EMAIL_MARKDOWN =="false" || process.env.EMAIL_MARKDOWN ==false) {
|
|
117
|
+
this.markdown = false;
|
|
118
|
+
}
|
|
119
|
+
// this.markdown = process.env.EMAIL_MARKDOWN || true;
|
|
112
120
|
winston.info('EmailService markdown: '+ this.markdown);
|
|
113
121
|
|
|
114
122
|
this.headers = {
|
|
@@ -252,6 +260,8 @@ class EmailService {
|
|
|
252
260
|
};
|
|
253
261
|
|
|
254
262
|
winston.debug('mailOptions', mailOptions);
|
|
263
|
+
winston.debug(' mail.config', mail.config);
|
|
264
|
+
|
|
255
265
|
if (!mail.to) {
|
|
256
266
|
return winston.warn("EmailService send method. to field is not defined", mailOptions);
|
|
257
267
|
}
|
|
@@ -1683,6 +1693,6 @@ async sendRequestTranscript(to, messages, request, project) {
|
|
|
1683
1693
|
|
|
1684
1694
|
var emailService = new EmailService();
|
|
1685
1695
|
|
|
1686
|
-
|
|
1696
|
+
emailService.sendTest("abc@abc.it");
|
|
1687
1697
|
|
|
1688
1698
|
module.exports = emailService;
|