Merge bc468e9 into bdee3c0

server/controllers/userController.js

@@ -1,8 +1,8 @@
 import { validationResult } from 'express-validator/check';
 import bcrypt from 'bcrypt';
-import jwt from 'jsonwebtoken';
 import { query } from '../db/index';
 import queries from '../db/queries';
+import signAuthToken from '../utils/signAuthToken';
 
 
 class userController {
@@ -53,9 +53,8 @@ class userController {
 
           // create token using new data and sign with password hash+lastLogin+lastLogout
           const userInfo = newUser.rows[0];
-          const jwtSecret = process.env.SECRET_KEY;
           const data = { email: userInfo.email, createdOn: userInfo.created_on };
-          const token = jwt.sign(data, jwtSecret, { expiresIn: '2h' });
+          const token = signAuthToken(data);
 
           // signed token - 201
           res.status(201).json({ token });
@@ -100,10 +99,10 @@ class userController {
           return;
         }
         // create token
-        const jwtSecret = process.env.SECRET_KEY;
-        const token = jwt.sign({
+        const data = {
           email: userData.rows[0].email, createdOn: userData.rows[0].created_on,
-        }, jwtSecret);
+        };
+        const token = signAuthToken(data);
         // return signed token - 200
         res.status(200).json({ token });
       });

server/utils/signAuthToken.js

@@ -0,0 +1,12 @@
+import jwt from 'jsonwebtoken';
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+const signAuthToken = (data) => {
+  const jwtSecret = process.env.SECRET_KEY;
+  const options = { expiresIn: '2h' };
+  return jwt.sign(data, jwtSecret, options);
+};
+
+export default signAuthToken;

test/test.js

@@ -170,7 +170,7 @@ describe('/GET entries', () => {
     chai
       .request(app)
       .get('/api/v1/entries')
-      .set('Authorization', null)
+      .set('Authorization', '')
       .end((err, res) => {
         expect(res).to.have.status(401);
         expect(res.body).to.be.an('object');