Add support for JSON body in task cancel/restart/remove

pull/85/head
Piero Toffanin 2019-05-27 11:33:45 -04:00
rodzic e140dee0dc
commit 883002f585
1 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -45,6 +45,7 @@ app.use('/swagger.json', express.static('docs/swagger.json'));
const formDataParser = multer().none(); const formDataParser = multer().none();
const urlEncodedBodyParser = bodyParser.urlencoded({extended: false}); const urlEncodedBodyParser = bodyParser.urlencoded({extended: false});
const jsonBodyParser = bodyParser.json();
let taskManager; let taskManager;
let server; let server;
@ -525,7 +526,7 @@ let successHandler = res => {
* schema: * schema:
* $ref: "#/definitions/Response" * $ref: "#/definitions/Response"
*/ */
app.post('/task/cancel', urlEncodedBodyParser, authCheck, uuidCheck, (req, res) => { app.post('/task/cancel', urlEncodedBodyParser, jsonBodyParser, authCheck, uuidCheck, (req, res) => {
taskManager.cancel(req.body.uuid, successHandler(res)); taskManager.cancel(req.body.uuid, successHandler(res));
}); });
@ -553,7 +554,7 @@ app.post('/task/cancel', urlEncodedBodyParser, authCheck, uuidCheck, (req, res)
* schema: * schema:
* $ref: "#/definitions/Response" * $ref: "#/definitions/Response"
*/ */
app.post('/task/remove', urlEncodedBodyParser, authCheck, uuidCheck, (req, res) => { app.post('/task/remove', urlEncodedBodyParser, jsonBodyParser, authCheck, uuidCheck, (req, res) => {
taskManager.remove(req.body.uuid, successHandler(res)); taskManager.remove(req.body.uuid, successHandler(res));
}); });
@ -588,7 +589,7 @@ app.post('/task/remove', urlEncodedBodyParser, authCheck, uuidCheck, (req, res)
* schema: * schema:
* $ref: "#/definitions/Response" * $ref: "#/definitions/Response"
*/ */
app.post('/task/restart', urlEncodedBodyParser, authCheck, uuidCheck, (req, res, next) => { app.post('/task/restart', urlEncodedBodyParser, jsonBodyParser, authCheck, uuidCheck, (req, res, next) => {
if (req.body.options){ if (req.body.options){
odmInfo.filterOptions(req.body.options, (err, options) => { odmInfo.filterOptions(req.body.options, (err, options) => {
if (err) res.json({ error: err.message }); if (err) res.json({ error: err.message });