This commit is contained in:
Expand-sys 2021-10-19 13:21:18 +11:00
parent aad4b5b273
commit 4b81a21eac
4 changed files with 2 additions and 75 deletions

View file

@ -1,13 +0,0 @@
const { CCashClient } = require("ccash-client-js");
async function postUser(name, password) {
const client = new CCashClient(process.env.BANKAPIURL);
console.log(process.env.BANKAPIURL);
try {
return await client.addUser(name, password);
} catch (err) {
console.log(err);
}
}
module.exports = { postUser };

View file

@ -14,7 +14,6 @@ const got = require("got");
const url = require("url");
const fs = require("fs");
const { CCashClient } = require("ccash-client-js");
fastify.register(require("fastify-formbody"));
fastify.register(require("fastify-static"), {
@ -93,8 +92,6 @@ fastify.get("/", async function (req, res) {
if (process.env.SETUP == false || !process.env.SETUP) {
res.view("setup");
} else {
//const client = new CCashClient(process.env.BANKAPIURL);
//let checkalive = await client.ping();
let checkalive = await got(`${api}../properties`, {
headers: {
Accept: "application/json",
@ -122,7 +119,6 @@ fastify.get(
preValidation: [validate],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let successes = req.session.get("successes");
req.session.set("successes", "");
let errors = req.session.get("errors");
@ -238,7 +234,6 @@ fastify.post(
preValidation: [validate],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { amount, name, senderpass } = req.body;
req.session.set("errors", "");
req.session.set("successes", "");
@ -268,7 +263,6 @@ fastify.post(
);
fastify.post("/register", async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
var { name, password, password2 } = req.body;
req.session.set("successes", "");
req.session.set("errors", "");
@ -308,18 +302,11 @@ fastify.post("/register", async function (req, res) {
});
fastify.post("/login", async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
if (req.session.get("user")) {
res.redirect("/");
}
const { name, password } = req.body;
/*try {
adminTest = await client.adminVerifyPassword(password);
} catch (err) {
console.log(err);
}*/
let auth = btoa(`${name}:${password}`);
auth = `Basic ${auth}`;
let adminTest;
@ -370,8 +357,6 @@ fastify.register(require("./routes/admin"), { prefix: "/admin" });
fastify.register(require("./routes/settings"), { prefix: "/settings" });
fastify.get("/logout", async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
//let checkalive = await client.ping();
let checkalive = await got(`${api}../properties`, {
headers: {
Accept: "application/json",
@ -394,7 +379,6 @@ fastify.get("/logout", async function (req, res) {
});
fastify.get("/login", async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let successes = req.session.get("successes");
req.session.set("successes", "");
let errors = req.session.get("errors");
@ -420,7 +404,6 @@ fastify.get("/login", async function (req, res) {
});
fastify.get("/register", async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let successes = req.session.get("successes");
req.session.set("successes", "");
let errors = req.session.get("errors");

View file

@ -1,12 +1,10 @@
const root = process.env.PWD;
const path = require("path");
const pug = require("pug");
const { postUser } = require(`${root}/helpers/functions.js`);
const got = require("got");
const fs = require("fs");
const { CCashClient } = require("ccash-client-js");
const api = process.env.BANKAPIURL;
console.log("Sen was here");
module.exports = function (fastify, opts, done) {
@ -16,8 +14,6 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
//let checkalive = await client.ping();
let checkalive = await got(`${api}../properties`, {
headers: {
Accept: "application/json",
@ -49,19 +45,12 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { name, init_pass, init_bal, password2 } = req.body;
if (!name || !init_pass || !init_bal || !password2) {
req.session.set("errors", "please fill in all fields");
} else if (init_pass !== password2) {
req.session.set("errors", "Passwords don't match");
}
/*let post = await client.adminAddUser(
name,
req.session.get("adminp"),
init_pass,
parseInt(init_bal)
);*/
let post;
try {
post = await got.post(`${api}/admin/user/register`, {
@ -93,12 +82,10 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { name } = req.body;
let balance;
req.session.set("successes", "");
req.session.set("errors", "");
//balance = await client.balance(name);
let responsecode;
try {
balance = await got(`${api}/user/balance`, {
@ -133,16 +120,10 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { name, amount } = req.body;
let patch;
req.session.successes = [];
req.session.errors = [];
/*patch = await client.setBalance(
name,
req.session.get("adminp"),
parseInt(amount)
);*/
try {
patch = await got.patch(`${api}/admin/set_balance`, {
headers: {
@ -173,16 +154,10 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { name, amount } = req.body;
let patch;
req.session.successes = [];
req.session.errors = [];
/*patch = await client.setBalance(
name,
req.session.get("adminp"),
parseInt(amount)
);*/
try {
patch = await got.post(`${api}/admin/impact_balance`, {
@ -212,14 +187,9 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { name, new_pass, password2 } = req.body;
let patch;
/*patch = await client.changePassword(
req.session.get("user"),
attempt,
new_pass
);*/
if (new_pass == password2) {
try {
patch = await got.patch(`${api}/user/change_password`, {
@ -253,10 +223,8 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { name, attempt } = req.body;
//let deleteUser = client.adminDeleteUser(name, attempt);
if (attempt != req.session.get("adminp"))
try {
let deleteUser = await got.delete(`${api}/admin/user/delete`, {
@ -320,7 +288,6 @@ module.exports = function (fastify, opts, done) {
preValidation: [validateAdmin],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { attempt } = req.body;
let name = req.session.get("user");
let close;

View file

@ -2,7 +2,7 @@ const root = process.env.PWD;
const path = require("path");
var pug = require("pug");
const { postUser } = require(`${root}/helpers/functions.js`);
const { CCashClient } = require("ccash-client-js");
const got = require("got");
function validate(req, res, next) {
if (!req.session.get("user")) {
@ -20,8 +20,6 @@ module.exports = function (fastify, opts, done) {
preValidation: [validate],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
//let checkalive = await client.ping();
let checkalive = await got(`${api}../properties`, {
headers: {
Accept: "application/json",
@ -52,7 +50,6 @@ module.exports = function (fastify, opts, done) {
preValidation: [validate],
},
async function (req, res) {
//const client = new CCashClient(process.env.BANKAPIURL);
let { attempt, new_pass, password2 } = req.body;
let patch;
if (attempt == undefined) {
@ -67,11 +64,6 @@ module.exports = function (fastify, opts, done) {
req.session.set("errors", "Password must be at least 6 characters");
res.redirect("/settings");
} else {
/*patch = await client.changePassword(
req.session.get("user"),
attempt,
new_pass
);*/
try {
patch = await got.patch(`${api}/user/change_password`, {
headers: {
@ -109,7 +101,6 @@ module.exports = function (fastify, opts, done) {
preValidation: [validate],
},
async function (req, res) {
// const client = new CCashClient(process.env.BANKAPIURL);
let { password, password2 } = req.body;
let del;
if (!password || !password2) {
@ -125,7 +116,6 @@ module.exports = function (fastify, opts, done) {
let name = req.session.get("user");
let auth = btoa(`${name}:${password}`);
auth = `Basic ${auth}`;
//del = await client.deleteUser(req.session.user, password);
try {
del = await got.delete(`${api}/user/delete`, {
headers: {