Merge branch 'master' of github.com:danizavtz/tokenAuth

Author: daniel.pires

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
     "env": {
-        "es6": true,
+        "es2018": true,
         "node": true
     },
     "extends": "eslint:recommended",
@@ -23,6 +23,7 @@ module.exports = {
         "semi": [
             "error",
             "always"
-        ]
+        ],
+        "no-useless-catch": "off"
     }
 };

app.js

@@ -1,4 +1,4 @@
-require('dotenv').config()
+require('dotenv').config();
 const express = require('express');
 const logger = require('morgan');
 const cors = require('cors');

bin/www

@@ -5,5 +5,5 @@ try {
     app.listen(process.env.PORT);
     console.log('Microsservice login listening at http://localhost:%s', process.env.PORT);
 } catch (e) {
-    throw e
+    throw e;
 }

lib/postgres.js

@@ -1,7 +1,7 @@
-const { Pool } = require('pg')
-const pool = new Pool()
+const { Pool } = require('pg');
+const pool = new Pool();
 module.exports = {
-  query: (text, params, callback) => {
-    return pool.query(text, params, callback)
-  },
-}
+    query: (text, params, callback) => {
+        return pool.query(text, params, callback);
+    },
+};

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "nodemon ./bin/www",
     "start": "node ./bin/www",
-    "lint": "./node_modules/.bin/eslint ./server/**/*.js",
+    "lint": "./node_modules/.bin/eslint ./server/**/*.js ./bin/www ./lib/*.js app.js",
     "test": "mocha --reporter progress test/ --exit",
     "coverage": "nyc mocha --exit --reporter progress ./test/",
     "coverage:report": "nyc report --reporter=lcov --reporter=text",

server/controllers/index.controller.js

@@ -0,0 +1,13 @@
+
+exports.secure_route =  (req, res) => {
+    req.sucesso = { msg: 'server up and running secure route'};
+    res.status(200).json(req.sucesso);
+};
+
+exports.index = (req, res) => {
+    res.status(200).json({msg: 'server up and running'});
+};
+
+exports.fallback = (req, res) => {
+    res.status(404).json({ errors: [{location: req.path, msg: 'Not found', param: null}]});
+};

server/controllers/login.controller.js

@@ -1,11 +1,6 @@
-const postgres = require('../../lib/postgres');
 const jwt = require('jsonwebtoken');
 const crypto = require('crypto');
-
-exports.logEmployee = (req, res) => {
-    res.status(200).json({ token: 'Bearer ' + jwt.sign(req.employee, process.env.SECRET, { expiresIn: 1800 }) });//expires in 1800 seconds
-    res.end();
-};
+const loginService = require('../services/login.service');
 
 exports.hashPassword = (req, res, next) => {
     crypto.scrypt(req.body.password.toString(), 'salt', 256, (err, derivedKey) => {
@@ -17,16 +12,21 @@ exports.hashPassword = (req, res, next) => {
     });
 };
 
-exports.lookupLogin = (req, res, next) => {
-    const sql = 'SELECT e.employee_id, e.login FROM employee e WHERE e.login=$1 AND e.password = $2';
-    postgres.query(sql, [req.body.login, req.body.kdfResult], (err, result) => {
-        if (err) {
-            return res.status(500).json({ errors: [{ location: req.path, msg: 'Could not do login', param: req.params.id }] });
-        }
-        if (result.rows.length === 0) {
-            return res.status(404).json({ errors: [{ location: req.path, msg: 'User or password does not match', param: req.params.id }] });
+exports.lookupLogin = async (req, res, next) => {
+    try {
+        const result = await loginService.lookupLogin(req.body);
+        if (result.length === 0) {
+            res.status(404).json({ errors: [{ location: req.path, msg: 'User or password does not match', param: req.params.id }] });
+            return;
         }
-        req.employee = result.rows[0];
+        req.employee = result[0];
         next();
-    });
-};
+    } catch (err) {
+        res.status(500).json({ errors: [{ location: req.path, msg: 'Could not do login', param: null }] });
+    }
+};
+
+exports.logEmployee = (req, res) => {
+    res.status(200).json({ token: 'Bearer ' + jwt.sign(req.employee, process.env.SECRET, { expiresIn: 1800 }) });//expires in 1800 seconds
+    res.end();
+};

server/index.js

@@ -1,17 +1,6 @@
     const router = require('express').Router();
 
     router.use(require('./routes/login.route'));
-    router.get('/secure', (req, res) => {
-        req.sucesso = { msg: 'server up and running secure route'};
-        res.status(200).json(req.sucesso);
-    });
-
-    router.get('/', (req, res) => {
-        res.status(200).json({msg: "server up and running"});
-    });
-      //após tentar casar todas as rotas a ultima rota que sobrou é not found
-    router.get('*', (req, res) => {
-        res.status(404).json({ errors: [{location: req.path, msg: 'Not found', param: null}]});
-    });
+    router.use(require('./routes/index.route'));
 
     module.exports = router;

server/routes/index.route.js

@@ -0,0 +1,8 @@
+const router = require('express').Router();
+const indexController = require('../controllers/index.controller');
+
+router.get('/secure', indexController.secure_route);
+router.get('/', indexController.index);
+router.get('*', indexController.fallback);
+
+module.exports = router;

server/services/login.service.js

@@ -0,0 +1,11 @@
+const postgres = require('../../lib/postgres');
+
+exports.lookupLogin = async (usuario) => {
+    try {
+        const sql = 'SELECT e.employee_id, e.login FROM employee e WHERE e.login=$1 AND e.password = $2';
+        const { rows } = await postgres.query(sql, [usuario.login, usuario.kdfResult]);
+        return rows;
+    } catch (err) {
+        throw err;
+    }
+};

test/spec1.login.js

@@ -111,7 +111,7 @@ describe('#Login', () => {
                 routine: 'parserOpenTable'
             };
 
-            const stub = sinon.stub(pg, 'query').yields(new Error(mocked_error_from_database));
+            const stub = sinon.stub(pg, 'query').rejects(mocked_error_from_database);
             api.post('/login/')
                 .send({
                     "login": "admin",