aboutsummaryrefslogtreecommitdiffstats
path: root/routes
diff options
context:
space:
mode:
authorJohn Barratt <[email protected]>2023-02-28 12:20:10 -0800
committerJohn Barratt <[email protected]>2023-02-28 12:20:10 -0800
commit58e996a4ac227162f171e84530fe898cb504e045 (patch)
treeebc59d724acfcca6298bddb540811b7413d15980 /routes
parent6f5ffb59b83fb57546c46df6a610b8efaf1252cf (diff)
downloadcoinos-server-58e996a4ac227162f171e84530fe898cb504e045.tar.gz
coinos-server-58e996a4ac227162f171e84530fe898cb504e045.zip
add db connect try catch and commit before pull
Diffstat (limited to 'routes')
-rw-r--r--routes/email.js1
-rw-r--r--routes/requests.js4
-rw-r--r--routes/users.js10
3 files changed, 7 insertions, 8 deletions
diff --git a/routes/email.js b/routes/email.js
index 529307e6..6b2806a4 100644
--- a/routes/email.js
+++ b/routes/email.js
@@ -2,6 +2,7 @@ import config from "$config";
export default {
async send({ body }, res) {
+
try {
let postmark = await import("postmark");
let client = new postmark.ServerClient(config.postmark);
diff --git a/routes/requests.js b/routes/requests.js
index 11bf9a36..1b758dc3 100644
--- a/routes/requests.js
+++ b/routes/requests.js
@@ -16,11 +16,9 @@ export default {
async list({ user: { id } }, res) {
try {
const day = new Date(new Date().setDate(new Date().getDate() - 1));
-
let requests = await db.lRange(`${id}:requests`, 0, -1);
-
requests = await Promise.all(requests.map(id => g(`request:${id}`)));
-
+
requests = await Promise.all(
requests.map(async r => {
r.requester = await g(`user:${r.requester_id}`);
diff --git a/routes/users.js b/routes/users.js
index 2b8be4ab..c399b286 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -21,8 +21,9 @@ let { classic } = config;
export default {
upload,
-
+
async me({ user }, res) {
+
try {
user.balance = await g(`balance:${user.id}`);
user.prompt = !!user.prompt;
@@ -196,6 +197,7 @@ export default {
let user = await g(`user:${uid}`);
if (classic && !(user && user.migrated)) {
+
uid = user ? user.id : v4();
try {
@@ -262,7 +264,6 @@ export default {
if (!(u && u.id)) continue;
n.ref = u.id;
}
-
await s(`payment:${n.id}`, n);
await db.lPush(`${uid}:payments`, n.id);
}
@@ -272,7 +273,6 @@ export default {
console.log(e);
}
}
-
if (
!user ||
(user.password &&
@@ -284,7 +284,7 @@ export default {
warn("invalid username or password attempt", username);
return res.code(401).send({});
}
-
+
if (
user.twofa &&
(typeof twofa === "undefined" ||
@@ -292,7 +292,7 @@ export default {
) {
return res.code(401).send("2fa required");
}
-
+
l(
"login",
username,