chore: fixed lint (#43)

Author: chrisleekr

api/app/helpers/authentication.js

@@ -17,16 +17,14 @@ const generateToken = data => {
 
 const verifyToken = async jwtToken => {
  try {
- return await jwt.verify(jwtToken, secretKey, { algorithm: 'HS256' });
+ return jwt.verify(jwtToken, secretKey, { algorithm: 'HS256' });
  } catch (e) {
  moduleLogger.error({ e });
  return null;
  }
 };
 
-const getTokenData = async req => {
- return verifyToken(req.headers.authorization);
-};
+const getTokenData = async req => verifyToken(req.headers.authorization);
 
 const isAuthenticated = async (req, res, next) => {
  if (typeof req.headers.authorization !== 'undefined') {

api/app/helpers/database.js

@@ -28,9 +28,7 @@ const getPool = async () => {
 };
 
 const currentTimestamp = {
- toSqlString: () => {
- return 'CURRENT_TIMESTAMP()';
- }
+ toSqlString: () => 'CURRENT_TIMESTAMP()'
 };
 
 const fetchWithPagination = async (query, values, { page = 1, pageSize = 10 } = {}) => {

api/app/helpers/response.js

@@ -4,14 +4,13 @@ const { getTokenData } = require('./authentication');
 const userModel = require('../models/userModel');
 const permissionModel = require('../models/permissionModel');
 
-const emitValidationResponse = (res, errorArray) => {
- return res.status(422).json({
+const emitValidationResponse = (res, errorArray) =>
+ res.status(422).json({
  success: false,
  status: 422,
  message: errorArray.length === 1 ? 'There is a validation error.' : 'There are validation errors.',
  data: errorArray
  });
-};
 
 const handleValidationError = (req, res) => {
  const errors = validationResult(req);
@@ -22,39 +21,32 @@ const handleValidationError = (req, res) => {
  return null;
 };
 
-const handleCustomValidationError = (res, errorArray) => {
- return emitValidationResponse(res, errorArray);
-};
+const handleCustomValidationError = (res, errorArray) => emitValidationResponse(res, errorArray);
 
-const handleSuccess = (res, message, data) => {
- return res.status(200).json({
+const handleSuccess = (res, message, data) =>
+ res.status(200).json({
  success: true,
  status: 200,
  message,
  data
  });
-};
 
-const handleNotFound = (res, message) => {
- return res.status(404).json({
+const handleNotFound = (res, message) =>
+ res.status(404).json({
  success: false,
  status: 404,
  message,
  data: {}
  });
-};
-const handleForbidden = (res, message) => {
- return res.status(403).json({
+const handleForbidden = (res, message) =>
+ res.status(403).json({
  success: false,
  status: 403,
  message,
  data: {}
  });
-};
 
-const handleRedirect = (res, status, url) => {
- return res.redirect(status, url);
-};
+const handleRedirect = (res, status, url) => res.redirect(status, url);
 
 const handlePermissionError = async (req, res, permissionKey) => {
  const tokenData = await getTokenData(req);

api/app/models/permissionModel.js

@@ -72,7 +72,9 @@ const insertOne = async row => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  INSERT INTO permission (
  permission_key,
@@ -113,7 +115,9 @@ const getOne = async ({ searchOptions = {} } = {}) => {
  });
 
  try {
- row = await (await getPool()).query(
+ row = await (
+ await getPool()
+ ).query(
  `
  SELECT
  id,
@@ -157,7 +161,9 @@ const updateOne = async (id, row) => {
  values.push(id);
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE
  permission
@@ -188,7 +194,9 @@ const deleteOne = async id => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  DELETE FROM permission
  WHERE id = ?
@@ -223,7 +231,9 @@ const findPermissionUsers = async ({ searchOptions = {} } = {}) => {
  });
 
  try {
- rows = await (await getPool()).query(
+ rows = await (
+ await getPool()
+ ).query(
  `
  SELECT
  permission.id,
@@ -260,7 +270,9 @@ const replacePermissionUser = async row => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  INSERT INTO permission_user (
  permission_id,
@@ -318,7 +330,9 @@ const deletePermissionUsers = async searchOptions => {
  }
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  DELETE FROM
  permission_user

api/app/models/settingModel.js

@@ -72,7 +72,9 @@ const insertOne = async row => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  INSERT INTO setting (
  meta_key,
@@ -134,7 +136,9 @@ const getOne = async ({ searchOptions = {}, includeDeletedSetting = false } = {}
  });
 
  try {
- row = await (await getPool()).query(
+ row = await (
+ await getPool()
+ ).query(
  `
  SELECT
  id,
@@ -180,7 +184,9 @@ const updateOne = async (id, row) => {
  values.push(id);
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE
  setting
@@ -208,7 +214,9 @@ const deleteOne = async id => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE setting
  SET status = ?
@@ -253,7 +261,9 @@ const deleteAll = async ({ searchOptions = {} }) => {
  }
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE setting
  SET status = ?

api/app/models/todoModel.js

@@ -81,7 +81,9 @@ const getMaxPosition = async ({ searchOptions = {} } = {}) => {
  });
 
  try {
- row = await (await getPool()).query(
+ row = await (
+ await getPool()
+ ).query(
  `
  SELECT
  MAX(position) AS max_position
@@ -109,7 +111,9 @@ const insertOne = async row => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  INSERT INTO todo (
  user_id,
@@ -158,7 +162,9 @@ const getOne = async ({ searchOptions = {}, includeDeletedTodo = false } = {}) =
  });
 
  try {
- row = await (await getPool()).query(
+ row = await (
+ await getPool()
+ ).query(
  `
  SELECT
  id,
@@ -201,7 +207,9 @@ const updateOne = async (id, row) => {
  values.push(id);
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE
  todo
@@ -229,7 +237,9 @@ const deleteOne = async id => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE todo
  SET status = ?
@@ -274,7 +284,9 @@ const deleteAll = async ({ searchOptions = {} }) => {
  }
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE todo
  SET status = ?

api/app/models/userModel.js

@@ -153,7 +153,9 @@ const insertOne = async row => {
  }
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  INSERT INTO user (
  username,
@@ -264,7 +266,9 @@ const getOne = async ({
  const passwordHash = includePasswordHash ? 'password_hash, password_reset_token' : '';
 
  try {
- row = await (await getPool()).query(
+ row = await (
+ await getPool()
+ ).query(
  `
  SELECT
  id,
@@ -359,7 +363,9 @@ const updateOne = async (id, row) => {
  values.push(id);
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE
  user
@@ -390,7 +396,9 @@ const deleteOne = async id => {
  let result = false;
 
  try {
- result = await (await getPool()).query(
+ result = await (
+ await getPool()
+ ).query(
  `
  UPDATE user
  SET status = ?
@@ -413,8 +421,6 @@ const deleteOne = async id => {
 // Set user roles based on the request type
 // - staff: [administrator, staff]
 // - user: [user]
-const getUserRoles = roleType => {
- return roleType === 'staff' ? [userRole.administrator, userRole.staff] : [userRole.user];
-};
+const getUserRoles = roleType => (roleType === 'staff' ? [userRole.administrator, userRole.staff] : [userRole.user]);
 
 module.exports = { findAll, insertOne, getOne, updateOne, deleteOne, userRole, userStatus, userEnabled, getUserRoles };

api/app/routes/index.js

@@ -17,17 +17,17 @@ const todo = require('./validations/todo');
 const user = require('./validations/user');
 
 module.exports = app => {
- app.route('/').get((_req, res) => {
- return res.send({
+ app.route('/').get((_req, res) =>
+ res.send({
  success: true,
  status: 200,
  message: 'OK',
  data: {
  serverStatus: 'online',
  version: packageJson.version
  }
- });
- });
+ })
+ );
 
  app
  .route('/me')

api/app/server.js

@@ -22,9 +22,7 @@ app.use(
  logName: 'reqId',
  obscureHeaders: ['authorization'],
  logger,
- additionalRequestFinishData: (_req, _res) => {
- return {};
- }
+ additionalRequestFinishData: (_req, _res) => ({})
  })
 );