extended user login test

backend/app.js

@@ -15,7 +15,7 @@ app.use(express.json());
 app.use(express.urlencoded({ extended: true }));
 
 // database
-const db = require("./models/index");
+const db = require("./models");
 const Role = db.Role;
 const User = db.User;
 const PitchType = db.pitchType;

backend/controllers/user.controller.js

@@ -1,5 +1,5 @@
 const db = require("../models/index");
-const User = db.user;
+const User = db.User;
 const Op = db.Sequelize.Op;
 
 exports.findAll = (req, res) => {

backend/models/user.model.js

@@ -52,6 +52,15 @@ module.exports = (sequelize, DataTypes) => {
         user.password = await bcrypt.hash(user.password, salt);
       }
     }
+  }, {
+    defaultScope: {
+      attributes: { exclude: ['password'] },
+    },
+    scopes: {
+      withSecretColumns: {
+        attributes: { include: ['password'] },
+      },
+    },
   });
 
   User.prototype.validPassword = function (password) {

backend/test/user.test.js

@@ -13,38 +13,35 @@ const { signupUser } = require("./data/user.test.data")
 const res = require("express/lib/response");
 
 describe("Test user authentication", () => {
-    test("should signup a user", done => {
+    test("should signup a user", async () => {
-        request(app)
+        const response = await request(app)
             .post("/api/auth/signup")
-            .send(signupUser)
+            .send(signupUser);
-            .then( res => {
+
-                expect(res.header['content-type']).toBe('application/json; charset=utf-8');
+        expect(response.header['content-type']).toBe('application/json; charset=utf-8');
-                expect(res.statusCode).toBe(200);
+        expect(response.statusCode).toBe(200);
-                done();
-            });
     });
 
-    test("Test user login", done => {
+    test("Test user login", async () => {
         let user = {};
-        request(app)
+        let response = await request(app)
             .post("/api/auth/signin")
             .send({
                 email: 'ryan.nolan@bullpen.com',
                 password: 'nolan'
-            })
-            .then( res => {
-                expect(res.statusCode).toBe(200);
-                expect(res.body.accessToken).not.toBeNull();
-                console.log(res.body);
-                user = res.body;
-                done();
-            // }).then(() => {
-            //     request(app)
-            //         .get(`/api/users/${user.id}`)
-            //         .then( res2 => {
-            //             expect(res2.statusCode).toBe(200);
-            //         })
-            //
             });
+        expect(response.statusCode).toBe(200);
+        expect(response.body.accessToken).not.toBeNull();
+        user = response.body;
+
+        response = await request(app)
+            .get(`/api/users/${user.id}`);
+        expect(response.statusCode).toBe(403);
+
+        response = await request(app)
+            .get(`/api/users/${user.id}`)
+            .set('x-access-token', user.accessToken);
+        console.log(response.body);
+        expect(response.statusCode).toBe(200);
     });
 });