StarMirror
/
haste-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge ec3aac6aa9 into 5d2965ffc5

pull/197/merge
Manuel Nuñez 2020-10-13 16:40:59 +02:00 committed by GitHub
parent 5d2965ffc5 ec3aac6aa9
commit 28de88e5b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/document_handler.js
View File

@ -74,6 +74,7 @@ DocumentHandler.prototype.handlePost = function (request, response) {
var _this = this;
var buffer = '';
var cancelled = false;
var ct = request.headers['content-type'];
// What to do when done
var onSuccess = function () {
@ -87,6 +88,20 @@ DocumentHandler.prototype.handlePost = function (request, response) {
);
return;
}
//added support for json data
if (ct && ct.split(';')[0] === 'application/json') {
try {
let json = JSON.parse(buffer);
buffer = json.data;
} catch(e) {
winston.verbose('error adding document');
response.writeHead(500, { 'content-type': 'application/json' });
response.end(JSON.stringify({ message: 'invalid JSON received.' }));
return;
}
}
// And then save if we should
_this.chooseKey(function (key) {
_this.store.set(key, buffer, function (res) {
@ -105,7 +120,6 @@ DocumentHandler.prototype.handlePost = function (request, response) {
};
// If we should, parse a form to grab the data
var ct = request.headers['content-type'];
if (ct && ct.split(';')[0] === 'multipart/form-data') {
var busboy = new Busboy({ headers: request.headers });
busboy.on('field', function (fieldname, val) {