From b758b85b158b566f703f93249fc8c12cb76c4cd7 Mon Sep 17 00:00:00 2001
From: benjaminramey <benramey@fastmail.com>
Date: Sun, 1 Nov 2020 20:54:26 -0600
Subject: [PATCH] Enforce more lint rules.

---
 .editorconfig            |  2 +-
 api/.eslintrc.json       |  6 ++++++
 api/app.js               |  7 +++++--
 api/config/passport.js   |  9 ++++++---
 api/controllers/users.js | 10 +++++++---
 api/models/users.js      | 20 +++++++++++++++-----
 6 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 7832c6c..d5accb9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,6 @@ indent_style = tab
 indent_size = 4
 
 # Matches the exact files either package.json or .travis.yml
-[{package.json}]
+[{package.json,serverless.yml}]
 indent_style = space
 indent_size = 2
diff --git a/api/.eslintrc.json b/api/.eslintrc.json
index 5dc16b9..fcd7bd0 100644
--- a/api/.eslintrc.json
+++ b/api/.eslintrc.json
@@ -28,6 +28,12 @@
 		"indent": [
 			"error",
 			"tab"
+		],
+		"curly": [
+			"error"
+		],
+		"brace-style": [
+			"error"
 		]
 	}
 }
diff --git a/api/app.js b/api/app.js
index 7b6da2e..31c9b17 100644
--- a/api/app.js
+++ b/api/app.js
@@ -9,8 +9,11 @@ const {
  * Configure Passport
  */
 
-try { require(`./config/passport`)(passport); }
-catch (error) { console.log(error); }
+try {
+	require(`./config/passport`)(passport);
+} catch (error) {
+	console.log(error);
+}
 
 /**
  * Configure Express.js Middleware
diff --git a/api/config/passport.js b/api/config/passport.js
index a714720..1bf8a32 100644
--- a/api/config/passport.js
+++ b/api/config/passport.js
@@ -14,13 +14,16 @@ module.exports = (passport) => {
 
 	passport.use(new StrategyJWT(options, async (jwtPayload, done) => {
 		let user;
-		try { user = await users.getById(jwtPayload.id); }
-		catch (error) {
+		try {
+			user = await users.getById(jwtPayload.id);
+		} catch (error) {
 			console.log(error);
 			return done(error, null);
 		}
 
-		if (!user) { return done(null, false); }
+		if (!user) {
+			return done(null, false);
+		}
 		return done(null, user);
 	}));
 };
diff --git a/api/controllers/users.js b/api/controllers/users.js
index 32a9ca4..7809ad8 100644
--- a/api/controllers/users.js
+++ b/api/controllers/users.js
@@ -43,10 +43,14 @@ const register = async (req, res, next) => {
  * @param {*} res
  * @param {*} next
  */
-const login = async (req, res) => {
+const login = async (req, res, next) => {
 	let user;
-	try { user = await users.getByEmail(req.body.email); }
-	catch (error) { return done(error, null); }
+	try {
+		user = await users.getByEmail(req.body.email);
+	} catch (error) {
+		console.log(error);
+		return next(error, null);
+	}
 
 	if (!user) {
 		return res.status(404).send({ error: `Authentication failed. User not found.` });
diff --git a/api/models/users.js b/api/models/users.js
index 05cc9d1..ac6f930 100644
--- a/api/models/users.js
+++ b/api/models/users.js
@@ -19,7 +19,9 @@ const dynamodb = new AWS.DynamoDB.DocumentClient({
 const register = async (user = {}) => {
 
 	// Validate
-	if (!user.email) throw new Error(`"email" is required`);
+	if (!user.email) {
+		throw new Error(`"email" is required`);
+	}
 	if (!user.password) {
 		throw new Error(`"password" is required`);
 	}
@@ -121,10 +123,18 @@ const getById = async (id) => {
 const convertToPublicFormat = (user = {}) => {
 	user.email = user.hk || null;
 	user.id = user.sk2 || null;
-	if (user.hk) delete user.hk;
-	if (user.sk) delete user.sk;
-	if (user.sk2) delete user.sk2;
-	if (user.password) delete user.password;
+	if (user.hk) {
+		delete user.hk;
+	}
+	if (user.sk) {
+		delete user.sk;
+	}
+	if (user.sk2) {
+		delete user.sk2;
+	}
+	if (user.password) {
+		delete user.password;
+	}
 	return user;
 };