Skip to content

Commit 0378d39

Browse files
committed
Merge branch 'master' into release.24.10
# Conflicts: # package-lock.json
2 parents 5013180 + 758f7f5 commit 0378d39

File tree

5 files changed

+390
-525
lines changed

5 files changed

+390
-525
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Dependencies:
66
- Bump countly-sdk-web from 24.4.1 to 24.11.0
77
- Bump tslib from 2.7.0 to 2.8.1
88
- Bump form-data from 4.0.0 to 4.0.1
9+
- Bump jimp from 0.22.12 to 1.6.0
10+
- Bump jsdoc from 4.0.3 to 4.0.4
11+
- Bump countly-sdk-nodejs from 22.6.0 to 24.10.0
912

1013
## Version 24.10.3
1114
Fixes:

api/parts/mgmt/apps.js

+8-15
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ appsApi.getAppsDetails = function(params) {
170170
* @param {params} params - params object with args to create app
171171
* @return {object} return promise object;
172172
**/
173-
const iconUpload = function(params) {
173+
const iconUpload = async function(params) {
174174
const appId = params.app_id || common.sanitizeFilename(params.qstring.args.app_id);
175175
if (params.files && params.files.app_image) {
176176
const tmp_path = params.files.app_image.path,
@@ -183,25 +183,18 @@ const iconUpload = function(params) {
183183
return Promise.reject();
184184
}
185185
try {
186-
return jimp.read(tmp_path, function(err, icon) {
187-
if (err) {
188-
log.e(err, err.stack);
189-
fs.unlink(tmp_path, function() {});
190-
return true;
186+
const icon = await jimp.Jimp.read(tmp_path);
187+
const buffer = await icon.cover({h: 72, w: 72}).getBuffer(jimp.JimpMime.png);
188+
countlyFs.saveData("appimages", target_path, buffer, {id: appId + ".png", writeMode: "overwrite"}, function(err3) {
189+
if (err3) {
190+
log.e(err3, err3.stack);
191191
}
192-
icon.cover(72, 72).getBuffer(jimp.MIME_PNG, function(err2, buffer) {
193-
countlyFs.saveData("appimages", target_path, buffer, {id: appId + ".png", writeMode: "overwrite"}, function(err3) {
194-
if (err3) {
195-
log.e(err3, err3.stack);
196-
}
197-
fs.unlink(tmp_path, function() {});
198-
});
199-
});
200192
});
201193
}
202194
catch (e) {
203-
log.e(e.stack);
195+
console.log("Problem uploading app icon", e);
204196
}
197+
fs.unlink(tmp_path, function() {});
205198
}
206199
};
207200

frontend/express/app.js

+18-29
Original file line numberDiff line numberDiff line change
@@ -1610,7 +1610,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
16101610
req.body.app_id = req.body.app_image_id;
16111611
}
16121612
var params = paramsGenerator({req, res});
1613-
validateCreate(params, 'global_upload', function() {
1613+
validateCreate(params, 'global_upload', async function() {
16141614
if (!req.session.uid && !req.body.app_image_id) {
16151615
res.end();
16161616
return false;
@@ -1634,25 +1634,18 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
16341634
}
16351635
plugins.callMethod("iconUpload", {req: req, res: res, next: next, data: req.body});
16361636
try {
1637-
jimp.read(tmp_path, function(err, icon) {
1638-
if (err) {
1639-
console.log(err, err.stack);
1640-
fs.unlink(tmp_path, function() {});
1641-
res.status(400).send(false);
1642-
return true;
1643-
}
1644-
icon.cover(72, 72).getBuffer(jimp.MIME_PNG, function(err2, buffer) {
1645-
countlyFs.saveData("appimages", target_path, buffer, {id: req.body.app_image_id + ".png", writeMode: "overwrite"}, function() {
1646-
fs.unlink(tmp_path, function() {});
1647-
res.send("appimages/" + req.body.app_image_id + ".png");
1648-
countlyDb.collection('apps').updateOne({_id: countlyDb.ObjectID(req.body.app_image_id)}, {'$set': {'has_image': true}}, function() {});
1649-
});
1650-
}); // save
1637+
const icon = await jimp.Jimp.read(tmp_path);
1638+
const buffer = await icon.cover({h: 72, w: 72}).getBuffer(jimp.JimpMime.png);
1639+
countlyFs.saveData("appimages", target_path, buffer, {id: req.body.app_image_id + ".png", writeMode: "overwrite"}, function() {
1640+
res.send("appimages/" + req.body.app_image_id + ".png");
1641+
countlyDb.collection('apps').updateOne({_id: countlyDb.ObjectID(req.body.app_image_id)}, {'$set': {'has_image': true}}, function() {});
16511642
});
16521643
}
16531644
catch (e) {
1654-
console.log(e.stack);
1645+
console.log("Problem uploading app icon", e);
1646+
res.status(400).send(false);
16551647
}
1648+
fs.unlink(tmp_path, function() {});
16561649
});
16571650
});
16581651

@@ -1694,23 +1687,19 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
16941687
}
16951688
plugins.callMethod("iconUpload", {req: req, res: res, next: next, data: req.body});
16961689
try {
1697-
jimp.read(tmp_path, function(err, icon) {
1698-
if (err) {
1699-
console.log(err, err.stack);
1700-
}
1701-
icon.cover(72, 72).getBuffer(jimp.MIME_PNG, function(err2, buffer) {
1702-
countlyFs.saveData("memberimages", target_path, buffer, {id: req.body.member_image_id + ".png", writeMode: "overwrite"}, function() {
1703-
fs.unlink(tmp_path, function() {});
1704-
countlyDb.collection('members').updateOne({_id: countlyDb.ObjectID(req.body.member_image_id + "")}, {'$set': {'member_image': "memberimages/" + req.body.member_image_id + ".png"}}, function() {
1705-
res.send("memberimages/" + req.body.member_image_id + ".png");
1706-
});
1707-
});
1708-
}); // save
1690+
const icon = await jimp.Jimp.read(tmp_path);
1691+
const buffer = await icon.cover({h: 72, w: 72}).getBuffer(jimp.JimpMime.png);
1692+
countlyFs.saveData("memberimages", target_path, buffer, {id: req.body.member_image_id + ".png", writeMode: "overwrite"}, function() {
1693+
countlyDb.collection('members').updateOne({_id: countlyDb.ObjectID(req.body.member_image_id + "")}, {'$set': {'member_image': "memberimages/" + req.body.member_image_id + ".png"}}, function() {
1694+
res.send("memberimages/" + req.body.member_image_id + ".png");
1695+
});
17091696
});
17101697
}
17111698
catch (e) {
1712-
console.log(e.stack);
1699+
console.log("Problem uploading member icon", e);
1700+
res.status(400).send(false);
17131701
}
1702+
fs.unlink(tmp_path, function() {});
17141703
});
17151704
});
17161705

0 commit comments

Comments
 (0)