Added favorites button to actor page.

src/auth.js

@@ -4,7 +4,7 @@ const util = require('util');
 const crypto = require('crypto');
 
 const knex = require('./knex');
-const { curateUser } = require('./users');
+const { curateUser, fetchUser } = require('./users');
 const { HttpError } = require('./errors');
 
 const scrypt = util.promisify(crypto.scrypt);
@@ -21,12 +21,7 @@ async function verifyPassword(password, storedPassword) {
 }
 
 async function login(credentials) {
-	const user = await knex('users')
-		.select('users.*', 'users_roles.abilities as role_abilities')
-		.where('username', credentials.username)
-		.orWhere('email', credentials.username)
-		.leftJoin('users_roles', 'users_roles.role', 'users.role')
-		.first();
+	const user = await fetchUser(credentials.username, true);
 
 	if (!user) {
 		throw new HttpError('Username or password incorrect', 401);
@@ -69,7 +64,7 @@ async function signup(credentials) {
 			email: credentials.email,
 			password: storedPassword,
 		})
-		.returning('*');
+		.returning('id');
 
 	await knex('stashes').insert({
 		user_id: user.id,
@@ -78,7 +73,7 @@ async function signup(credentials) {
 		public: false,
 	});
 
-	return curateUser(user);
+	return fetchUser(user.id);
 }
 
 module.exports = {