Skip to content

Commit

Permalink
fix: user registration
Browse files Browse the repository at this point in the history
AlexSciFier committed Nov 6, 2022
1 parent 5dba677 commit 225bfb4
Showing 4 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
*/node_modules
server/db/bookmarks.sqlite
server/public
.dockerignore
Dockerfile
Dockerfile.prod
9 changes: 5 additions & 4 deletions server/db/users.js
Original file line number Diff line number Diff line change
@@ -80,17 +80,18 @@ function addUUID(username, uuid) {
* @returns {Promise<User>}
*/
async function getUserByUUID(uuid) {
let userSettings =
db.prepare("SELECT * FROM userSettings WHERE uuid=?").get(uuid) ??
initDefaultSettings(uuid);
let user = db.prepare("SELECT * FROM users WHERE uuid=?").get(uuid);
if (user === undefined) return undefined;
if (getNologin() === true) {
user = db.prepare("SELECT * FROM users WHERE usergroup=0 LIMIT 1").get();
userSettings = db
.prepare("SELECT * FROM userSettings WHERE uuid=?")
.get(user.uuid);
return { ...user, ...userSettings };
}
if (user === undefined) return undefined;
let userSettings =
db.prepare("SELECT * FROM userSettings WHERE uuid=?").get(uuid) ??
initDefaultSettings(uuid);
return { ...user, ...userSettings };
}

5 changes: 3 additions & 2 deletions server/routes/api/users/index.js
Original file line number Diff line number Diff line change
@@ -43,7 +43,6 @@ module.exports = async function (fastify, opts) {
fastify.get(
"/me",
{
preHandler: requestForbidden,
schema: {
response: {
200: {
@@ -59,7 +58,9 @@ module.exports = async function (fastify, opts) {
},
async (request, reply) => {
let { SSID } = request.cookies;
return db.getUserByUUID(SSID);
let user = await db.getUserByUUID(SSID);
if (user === undefined) reply.notFound("User not found");
return user;
}
);

2 changes: 1 addition & 1 deletion server/routes/api/utils/preHandler.js
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ async function requestForbidden(request, reply) {
if (SSID) {
let user = await usersDB.getUserByUUID(SSID);
if (user === undefined) {
throw reply.unauthorized("You must login to use this method");
throw reply.notFound("User not found");
}
} else throw reply.unauthorized("You must login to use this method");
} catch (err) {

0 comments on commit 225bfb4

Please sign in to comment.