From 2987db8fbdc9c8f935e87efdda03c8f289045d62 Mon Sep 17 00:00:00 2001 From: Matej Sychra Date: Wed, 15 Nov 2023 23:40:36 +0100 Subject: [PATCH] from 7 issues --- lib/router.transfer.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/router.transfer.js b/lib/router.transfer.js index cef317e18..f8f5e5fbd 100644 --- a/lib/router.transfer.js +++ b/lib/router.transfer.js @@ -29,13 +29,12 @@ module.exports = function (app) { if (!Util.validateSession(req)) return res.status(401).end(); let owner = sanitka.owner(req.session.owner); const body = req.body; - await transfer.request(owner, body).catch( (error) => { + let response = await transfer.request(owner, body).catch( (error) => { console.log("[transferResultRedirect] await transfer.request with error", error, "in body", {body}); transferResultRedirect(false, res, error); - }).then((resolve) => { + }).then(() => { console.log("[transferResultRedirect] with response", response); transferResultRedirect(true, res, response); - resolve(true); }); } @@ -50,9 +49,8 @@ module.exports = function (app) { let response = await transfer.decline(body).catch((response) => { transferResultRedirect(false, res, response); - }).then((resolve) => { + }).then(() => { transferResultRedirect(true, res, response); - resolve(true); }); } @@ -69,7 +67,6 @@ module.exports = function (app) { udids: sanitka.udid(req.body.udid) }; - // may throw await transfer.decline(body).catch((error) => { transferResultRedirect(false, res, error); }).then(() => { @@ -81,12 +78,12 @@ module.exports = function (app) { if (!Util.isDefined(req.query.transfer_id)) return Util.responder(res, false, "transfer_id_missing"); - await transfer.accept({ + let response = await transfer.accept({ transfer_id: req.query.transfer_id, udids: [] }).catch((error) => { transferResultRedirect(false, res, error); - }).then((response) => { + }).then(() => { transferResultRedirect(true, res, response); }); } @@ -105,7 +102,7 @@ module.exports = function (app) { console.log("🔨 [debug] with body: ", {body}); await transfer.accept(body).catch((response) => { - console.log("postAcceptTransfer response", response); + console.log("[debug] postAcceptTransfer response", response); res.redirect(app_config.public_url + "/error.html?success=failed"); }).then(() => { res.redirect(app_config.public_url + "/error.html?success=true");