diff --git a/routes/admin.js b/routes/admin.js index 4c32604..32421e6 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -65,13 +65,15 @@ module.exports = function (fastify, opts, done) { "pass": init_pass, }), }); - post = post.ok; + } catch (e) { req.session.errors = `${e.text()}`; console.log(e.text()); } - if (post) { + if (post.ok) { req.session.successes = `User ${name} registered.`; + } else{ + req.session.errors = `${await post.text()}` } res.redirect("/admin"); } @@ -134,16 +136,17 @@ module.exports = function (fastify, opts, done) { "amount": parseInt(amount), }), }); - console.log(patch, patch.blob()) - patch = patch.ok; } catch (e) { req.session.errors = e; console.log(e); } console.log(patch); - if (patch) { + if (patch.ok) { req.session.successes = "Change Funds Successful"; + } else { + req.session.errors = `${await patch.text()}`; + } res.redirect("/admin"); } @@ -178,9 +181,13 @@ module.exports = function (fastify, opts, done) { req.session.errors = `${e}`; console.log(e); } - if (patch) { + if (patch.ok) { req.session.errors = "" req.session.successes = "Change Funds Successful"; + } else { + req.session.errors = `${await patch.text()}` + req.session.successes = ""; + } res.redirect("/admin"); } @@ -281,8 +288,6 @@ module.exports = function (fastify, opts, done) { "MARKETPLACE=" + process.env.MARKETPLACE + "\n" + - "MONGO=" + - process.env.MONGO + "\nSETUP=true" ); fs.mkdirSync(`${root}/tmp`); @@ -316,8 +321,10 @@ module.exports = function (fastify, opts, done) { req.session.errors = `${e}`; console.log(e); } - if (close) { + if (close.ok) { req.session.successes = "Closed instance"; + } else{ + req.session.errors = `${await close.text()}` } res.redirect("../"); } diff --git a/routes/settings.js b/routes/settings.js index aa60bf3..d6c559e 100644 --- a/routes/settings.js +++ b/routes/settings.js @@ -86,13 +86,15 @@ module.exports = function (fastify, opts, done) { console.log(e); } - if (patch == -2) { - req.session.errors = "Password Wrong"; - return res.redirect("/settings"); - } else { - req.session.destroy(); - //req.session.successes = "Change Password Successful, Please Login Again"; + if (patch.ok) { + req.session.user = null + req.session.password = null; + req.session.successes = "Change Password Successful, Please Login Again"; return res.redirect("/login"); + + } else { + req.session.errors = `${await patch.text()}`; + return res.redirect("/settings"); } } } @@ -135,8 +137,12 @@ module.exports = function (fastify, opts, done) { } console.log(del); - if (del) { - req.session.destroy(); + if (del.ok) { + req.session.user = null + req.session.password = null; + req.session.successes = "User Deletion Successful, This is IRREVERSIBLE please do not complain"; + } else{ + req.session.errors = `${await del.text()}` } res.redirect("/"); } diff --git a/views/settings.pug b/views/settings.pug index 48ebb1e..266c53c 100644 --- a/views/settings.pug +++ b/views/settings.pug @@ -20,7 +20,7 @@ block content br .card.shadow h4 DELETE ACCOUNT - p Dont do this unless you want your account deleted, hate that i have to put warnings on this but there is no undo + p This action is IRREVERSIBLE, do not complain if you deleted your account form(method='POST', action='/settings/delete') #form-group label Current Password: