fix: better error handling + typo correction

meese-os · Mar 2, 2024 · e703a52 · e703a52
1 parent 7988059
commit e703a52
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/backend/server/src/vfs.js b/backend/server/src/vfs.js
@@ -222,7 +222,7 @@ const createRequestFactory = (findMountpoint) =>
 				const [target, ...rest] = getter(req, res);
 				const [resource] = rest;
 
-				if (resouce instanceof Stream) {
+				if (resource instanceof Stream) {
 					resource.once("error", reject);
 				}
 

diff --git a/website/package.json b/website/package.json
@@ -10,6 +10,7 @@
     "serve": "node src/server/index.js",
     "build": "webpack && npm run build:manifest",
     "build:production": "NODE_ENV=production rush build",
+    "build:prod": "npm run build:production",
     "build:manifest": "meese-cli package:discover",
     "package:discover": "meese-cli package:discover",
     "package:create": "meese-cli package:create",

diff --git a/website/src/server/auth/adapter.js b/website/src/server/auth/adapter.js
@@ -33,13 +33,17 @@ module.exports = (_core, _options) => ({
 			groups = ["guest"];
 		} else {
 			// Validate the user against the 'database'
-			const users = JSON.parse(process.env.meeseOS_users);
-			const usernameExists = Object.prototype.hasOwnProperty.call(users, username);
-			if (usernameExists) {
-				const passwordCorrect = users[username].password === password;
-				if (passwordCorrect) {
-					groups = users[username].groups;
+			try {
+				const users = JSON.parse(process.env.meeseOS_users);
+				const usernameExists = Object.prototype.hasOwnProperty.call(users, username);
+				if (usernameExists) {
+					const passwordCorrect = users[username].password === password;
+					if (passwordCorrect) {
+						groups = users[username].groups;
+					}
 				}
+			} catch (e) {
+				console.error("Error validating user against the database:", e);
 			}
 		}
 

diff --git a/website/src/server/auth/template.env.json b/website/src/server/auth/template.env.json
@@ -9,6 +9,8 @@
       "groups": ["user"]
     }
   },
+	// Randomly generate these:
+	// node -e "console.log(require('crypto').randomBytes(32).toString('hex'))"
   "SESSION_SECRET": "thiswouldbenefitfrombeingrandomlygenerated",
   "JWT_SECRET": "youshouldprobablyrandomlygeneratethis",
   "JWT_REFRESH": "youshoulddefinitelyrandomlygeneratethisaswell",