chore(refactor): refactor codebase

- ensure that there are minimal errors [Finishes #164376263]
andela · Mar 4, 2019 · ef2c3b4 · ef2c3b4
1 parent b32871c
commit ef2c3b4
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 40 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -13,10 +13,34 @@
     "consistent-return": 0,
     "no-param-reassign": 0,
     "comma-dangle": 0,
-    "curly": ["error", "multi-line"],
-    "import/no-unresolved": [2, { "commonjs": true }],
-    "no-shadow": ["error", { "allow": ["req", "res", "err"] }],
-    "function-paren-newline": ["error", "never"],
+    "curly": [
+      "error",
+      "multi-line"
+    ],
+    "import/no-unresolved": [
+      2,
+      {
+        "commonjs": true
+      }
+    ],
+    "no-shadow": [
+      "error",
+      {
+        "allow": [
+          "req",
+          "res",
+          "err"
+        ]
+      }
+    ],
+    "function-paren-newline": [
+      "error",
+      "never"
+    ],
+    "indent": [
+      2,
+      2
+    ],
     "valid-jsdoc": [
       "error",
       {
@@ -41,6 +65,5 @@
   "parserOptions": {
     "ecmaVersion": 2017,
     "sourceType": "module"
-  },
-  "parser": "babel-eslint"
+  }
 }
diff --git a/package.json b/package.json
@@ -13,7 +13,8 @@
     "reset:db": "npm run sequelize db:migrate:undo:all && npm run sequelize db:migrate",
     "start:dev": "npm run reset:db && npm run dev",
     "build": "rm -rf dist && mkdir dist && babel -d ./dist ./server -s",
-    "heroku-postbuild": "NPM_CONFIG_PRODUCTION=false npm run build"
+    "heroku-postbuild": "NPM_CONFIG_PRODUCTION=false npm run build",
+    "lint": "eslint ./server --fix"
   },
   "lint-staged": {
     "*.js": [

diff --git a/server/app.js b/server/app.js
@@ -25,13 +25,15 @@ app.use(bodyParser.json());
 app.use(passport.initialize());
 
 // Creating user session
-app.use(expressSession(
-  { secret: process.env.SESSION_SECRET, resave: true, saveUninitialized: true }
-));
+app.use(expressSession({
+  secret: process.env.SESSION_SECRET,
+  resave: true,
+  saveUninitialized: true
+}));
 
 // Setup a default catch-all route that sends back a welcome message in JSON format.
 app.get('/', (req, res) => res.status(200).send({
-  message: 'Authors Haven.',
+  message: 'Authors Haven.'
 }));
 
 // Routes

diff --git a/server/controllers/user.js b/server/controllers/user.js
@@ -1,7 +1,7 @@
 import '@babel/polyfill';
 import dotenv from 'dotenv';
 import db from '../database/models';
-import { HelperUtils } from '../utils';
+import HelperUtils from '../utils';
 import response from '../utils/response';
 import verifyEmailMarkup from '../utils/markups/emailVerificationMarkup';
 import passwordResetMarkup from '../utils/markups/passwordResetMarkup';
@@ -33,15 +33,14 @@ export default class Users {
     const formInputs = { ...body, password: hash };
     try {
       const createUser = await User.create(formInputs);
-
-      const encryptDetails = {
-        id: createUser.id, firstname, lastname, username, email
-      };
-      const token = await HelperUtils.generateToken(encryptDetails);
-
-      const name = typeof username !== 'undefined' ? username : `${lastname}, ${firstname}`;
-
-      await HelperUtils.sendMail(email,
+      const token = HelperUtils.generateToken({
+        ...formInputs,
+        id: createUser.id
+      });
+      const name = typeof username !== 'undefined'
+        ? username
+        : `${lastname}, ${firstname}`;
+      HelperUtils.sendMail(email,
         'Authors Haven <no-reply@authorshaven.com>',
         'Email Verification',
         'Verify Email',

diff --git a/server/routes/profile.js b/server/routes/profile.js
@@ -5,31 +5,23 @@ import { AuthenticateUser } from '../middlewares';
 const profileRoutes = express.Router();
 
 // Fetch all users following you
-profileRoutes.get(
-  '/profiles/followers',
+profileRoutes.get('/profiles/followers',
   AuthenticateUser.verifyUser,
-  Follow.fetchFollowers
-);
+  Follow.fetchFollowers);
 
 // Fetch all users your're following
-profileRoutes.get(
-  '/profiles/following',
+profileRoutes.get('/profiles/following',
   AuthenticateUser.verifyUser,
-  Follow.fetchFollowing
-);
+  Follow.fetchFollowing);
 
 // Follow a particular user
-profileRoutes.post(
-  '/profiles/:username/follow',
+profileRoutes.post('/profiles/:username/follow',
   AuthenticateUser.verifyUser,
-  Follow.followUser
-);
+  Follow.followUser);
 
 // Unfollow a particular user
-profileRoutes.delete(
-  '/profiles/:username/follow',
+profileRoutes.delete('/profiles/:username/follow',
   AuthenticateUser.verifyUser,
-  Follow.unfollowUser
-);
+  Follow.unfollowUser);
 
 export default profileRoutes;
diff --git a/server/test/follow.spec.js b/server/test/follow.spec.js
@@ -2,7 +2,7 @@ import chaiHttp from 'chai-http';
 import chai, { expect } from 'chai';
 import dotenv from 'dotenv';
 import app from '../app';
-import { HelperUtils } from '../utils';
+import HelperUtils from '../utils';
 
 dotenv.config();
 chai.use(chaiHttp);

diff --git a/server/test/user.spec.js b/server/test/user.spec.js
@@ -1,7 +1,7 @@
 import chaiHttp from 'chai-http';
 import chai, { expect } from 'chai';
 import dotenv from 'dotenv';
-import { HelperUtils } from '../utils';
+import HelperUtils from '../utils';
 import app from '../app';
 
 dotenv.config();

diff --git a/server/utils/index.js b/server/utils/index.js
@@ -1,3 +1,3 @@
 import HelperUtils from './HelperUtils';
 
-export { HelperUtils };
+export default HelperUtils;