Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9055, non-standard API response from addThumbs route

Browse Source 
Also removed old thumb upload router handler, and updated uploadPost handling in composer to match new response schema
This commit is contained in:
Julian Lam
2020-12-04 14:32:57 -05:00
parent c09c238e3f
commit 340387c18a
4 changed files with 18 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/uploads.js
View File

@@ -11,6 +11,8 @@ const plugins = require('../plugins');
const image = require('../image');
const privileges = require('../privileges');
const helpers = require('./helpers');
const uploadsController = module.exports;
uploadsController.upload = async function (req, res, filesIterator) {
@@ -18,7 +20,7 @@ uploadsController.upload = async function (req, res, filesIterator) {
// These checks added because of odd behaviour by request: https://github.com/request/request/issues/2445
if (!Array.isArray(files)) {
return res.status(500).json('invalid files');
return helpers.formatApiResponse(500, res, new Error('[[error:invalid-file]]'));
}
if (Array.isArray(files[0])) {
files = files[0];
@@ -30,10 +32,10 @@ uploadsController.upload = async function (req, res, filesIterator) {
/* eslint-disable no-await-in-loop */
images.push(await filesIterator(fileObj));
}
res.status(200).json(images);
helpers.formatApiResponse(200, res, { images });
return images;
} catch (err) {
res.status(500).json({ path: req.path, error: err.message });
return helpers.formatApiResponse(500, res, err);
} finally {
deleteTempFiles(files);
}