Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-28 01:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #10020, /api/post/upload returns v3 style response

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-11-21 19:45:04 -05:00
parent 34de9608d0
commit 242f8e95ad
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/src/modules/uploader.js
View File

@@ -66,7 +66,6 @@ define('uploader', ['jquery-form'], function () {
module.ajaxSubmit = function (uploadModal, callback) { module.ajaxSubmit = function (uploadModal, callback) {
const uploadForm = uploadModal.find('#uploadForm'); const uploadForm = uploadModal.find('#uploadForm');
const v3 = uploadForm.attr('action').startsWith(config.relative_path + '/api/v3/');
uploadForm.ajaxSubmit({ uploadForm.ajaxSubmit({
headers: { headers: {
'x-csrf-token': config.csrf_token, 'x-csrf-token': config.csrf_token,
@@ -79,24 +78,14 @@ define('uploader', ['jquery-form'], function () {
uploadModal.find('#upload-progress-bar').css('width', percent + '%'); uploadModal.find('#upload-progress-bar').css('width', percent + '%');
}, },
success: function (response) { success: function (response) {
response = maybeParse(response); let images = maybeParse(response);
// Appropriately handle v3 API responses // Appropriately handle v3 API responses
if (v3) { if (response.hasOwnProperty('response') && response.hasOwnProperty('status') && response.status.code === 'ok') {
if (response.status.code === 'ok') { images = response.response.images;
response = response.response.images;
} else {
response = {
error: response.status.code,
};
}
} }
if (response.error) { callback(images[0].url);
return showAlert(uploadModal, 'error', response.error);
}
callback(response[0].url);
showAlert(uploadModal, 'success', '[[uploads:upload-success]]'); showAlert(uploadModal, 'success', '[[uploads:upload-success]]');
setTimeout(function () { setTimeout(function () {