fix: NoLogin option #10

AlexSciFier · Nov 11, 2022 · f26e0b6 · f26e0b6
1 parent 5e81fa1
commit f26e0b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/frontend/src/helpers/constants.js b/frontend/src/helpers/constants.js
@@ -1,5 +1,5 @@
 export const APP_NAME = "NeonLink";
-export const VERSION = "1.2.1";
+export const VERSION = "1.2.2";
 export const DEF_MAX_ITEMS = 20;
 export const DEF_COLUMNS = 3;
 export const CARD_HEADER_STYLE = [

diff --git a/server/db/users.js b/server/db/users.js
@@ -80,15 +80,17 @@ function addUUID(username, uuid) {
  * @returns {Promise<User>}
  */
 async function getUserByUUID(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
+    let noLoginUser = db
+      .prepare("SELECT * FROM users WHERE usergroup=0 LIMIT 1")
+      .get();
+    let noLoginUserSettings = db
       .prepare("SELECT * FROM userSettings WHERE uuid=?")
-      .get(user.uuid);
-    return { ...user, ...userSettings };
+      .get(noLoginUser.uuid);
+    return { ...noLoginUser, ...noLoginUserSettings };
   }
+  let user = db.prepare("SELECT * FROM users WHERE uuid=?").get(uuid);
+  if (user === undefined) return undefined;
   let userSettings =
     db.prepare("SELECT * FROM userSettings WHERE uuid=?").get(uuid) ??
     initDefaultSettings(uuid);