package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.9.5",
+  "version": "0.9.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.9.5",
+      "version": "0.9.4",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.8",
         "@dicebear/collection": "^7.0.5",

package.json

@@ -70,5 +70,5 @@
     "postcss-custom-media": "^10.0.2",
     "postcss-nesting": "^12.0.2"
   },
-  "version": "0.9.5"
+  "version": "0.9.4"
 }

src/auth.js

@@ -47,16 +47,20 @@ export async function login(credentials, userIp) {
 	const { user, stashes } = await fetchUser(credentials.username.trim(), {
 		email: true,
 		raw: true,
-	}).catch(() => {
-		throw new HttpError('Username or password incorrect', 401);
 	});
 
+	if (!user) {
+		throw new HttpError('Username or password incorrect', 401);
+	}
+
 	await verifyPassword(credentials.password, user.password);
 
 	await knex('users')
 		.update('last_login', 'NOW()')
 		.where('id', user.id);
 
+	console.log('login user', user);
+
 	logger.verbose(`Login from '${user.username}' (${user.id}, ${userIp})`);
 
 	try {

src/users.js

@@ -46,14 +46,14 @@ export async function fetchUser(userId, options = {}) {
 		.groupBy('users.id', 'users_roles.role')
 		.first();
 
-	if (!user) {
-		throw new HttpError(`User '${userId}' not found`, 404);
-	}
-
 	const stashes = await knex('stashes')
 		.where('user_id', user.id)
 		.leftJoin('stashes_meta', 'stashes_meta.stash_id', 'stashes.id');
 
+	if (!user) {
+		throw HttpError(`User '${userId}' not found`, 404);
+	}
+
 	if (options.raw) {
 		return { user, stashes };
 	}