modified user get test to exclude hashed password

Author: Jrschellenberg

src/middleware/index.js

@@ -2,7 +2,6 @@ const auth = require('basic-auth');
 const User = require('../models/user');
 import Utils from '../utils';
 
-
 export function authorizeUser(req, res, next) {
 	let user = auth(req);
 	if(!user || !user.name || !user.pass){

src/routes/user.js

@@ -4,17 +4,24 @@ const User = require('../models/user');
 import {authorizeUser} from "../middleware/index";
 import Utils from '../utils';
 
-/* GET home page. */
-router.get('/', authorizeUser, (req, res) => {
-	// if(!req.session || !req.session.userId){
-	// 	Utils.throwError()
-	// }
-	// User.findById(req.session.userId)
-	let status = 200;
-	res.status(status).json({success: true, message: "User Successfully retrieved", status: status});
+/* GET Routes */
+router.get('/', authorizeUser, (req, res, next) => {
+	if(!req.session || !req.session.userId){
+		return Utils.throwError(401, "Invalid or missing SessionId", next);
+	}
+	User.findById(req.session.userId)
+		.exec((error, user) => {
+			if(error){
+				return next(error);
+			}
+			let status = 200;
+			res.status(status).json({success: true, message: "User Successfully retrieved", status: status, user: user});
+		});
 });
 
-
+/*
+Post Routes
+ */
 router.post('/', (req, res, next) => {
 	if(!req.body.emailAddress || !req.body.fullName || !req.body.password){
 		return Utils.throwError(422, "Missing Parameters", next);

test/user_test.js

@@ -20,10 +20,10 @@ describe('Users', () => {
 			chai.request(server)
 				.get(getAPI)
 				.end((err, res) => {
-				res.should.have.status(401);
-				res.body.should.have.property('success').equal(false);
-				res.body.should.have.property('message').equal("Access Denied: Please supply login credentials!");
-				done();
+					res.should.have.status(401);
+					res.body.should.have.property('success').equal(false);
+					res.body.should.have.property('message').equal("Access Denied: Please supply login credentials!");
+					done();
 				});
 		});
 		it('should not GET if auth headers supplied are invalid', (done) => {
@@ -35,21 +35,33 @@ describe('Users', () => {
 		});
 
 		it('should GET if auth headers are present', (done) => {
+			let user = {
+				_id: "57029ed4795118be119cc437",
+				fullName: "Joe Smith",
+				emailAddress: "joe@smith.com",
+				__v: 0
+			};
+			
 			let auth = {
 				user: 'joe@smith.com',
 				pass: 'password'
 			};
-			getAuthRequest(auth, 200, true, "User Successfully retrieved", done);
+			getAuthRequest(auth, 200, true, "User Successfully retrieved", done, user);
 		});
 
-		function getAuthRequest(auth, status, success, msg, done){
+		function getAuthRequest(auth, status, success, msg, done, user) {
 			chai.request(server)
 				.get(getAPI)
 				.auth(auth.user, auth.pass)
 				.end((err, res) => {
 					res.should.have.status(status);
 					res.body.should.have.property('success').equal(success);
 					res.body.should.have.property('message').equal(msg);
+					if(user){
+						res.body.should.have.property('user').property('fullName').equal(user.fullName);
+						res.body.should.have.property('user').property('emailAddress').equal(user.emailAddress);
+						res.body.should.have.property('user').property('_id').equal(user._id);
+					}
 					done();
 				});
 		}
@@ -94,9 +106,9 @@ describe('Users', () => {
 						.post(postAPI)
 						.send(user)
 						.end((err, res) => {
-						res.body.should.have.property('message').equal("User Already Exists");
-						res.should.have.status(409); //Conflict error
-						done();
+							res.body.should.have.property('message').equal("User Already Exists");
+							res.should.have.status(409); //Conflict error
+							done();
 						});
 				});
 		});
@@ -126,7 +138,8 @@ describe('Users', () => {
 			};
 			postUser(user, done);
 		});
-		function postUser(user, done){
+		
+		function postUser(user, done) {
 			chai.request(server)
 				.post(postAPI)
 				.send(user)
@@ -136,7 +149,8 @@ describe('Users', () => {
 					done();
 				});
 		}
-		function postUser400(user, done ) {
+		
+		function postUser400(user, done) {
 			chai.request(server)
 				.post(postAPI)
 				.send(user)