added session and mongo-connect packages, refined tests.

Author: Jrschellenberg

package-lock.json

@@ -20,17 +20,18 @@
     "chai-http": "^3.0.0",
     "concurrently": "^3.5.1",
     "mocha": "^5.0.4",
-    "nodemon": "^1.9.1",
-    "superagent": "^3.8.2"
+    "nodemon": "^1.9.1"
   },
   "dependencies": {
     "basic-auth": "^2.0.0",
     "bcrypt": "^1.0.3",
     "body-parser": "~1.18.2",
     "config": "^1.30.0",
+    "connect-mongo": "^2.0.1",
     "cookie-parser": "~1.4.3",
     "debug": "~2.6.9",
     "express": "~4.15.5",
+    "express-session": "^1.15.6",
     "mongoose": "^5.0.10",
     "mongoose-seed": "^0.4.1",
     "morgan": "~1.9.0",

package.json

@@ -10,6 +10,8 @@ const data = require('./data/data.json');
 const User = require('./models/user');
 const Course = require('./models/course');
 const Review = require('./models/review');
+const session = require('express-session');
+const MongoStore = require('connect-mongo')(session);
 
 const config = require('config');
 const dbConfig = config.get('DBHost');
@@ -54,6 +56,17 @@ app.set('view engine', 'pug');
 // uncomment after placing your favicon in /public
 //app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
 
+app.use(session({
+	secret: "The Session secret, which should not be public. Put into a secrets.js",
+	resave: true,
+	saveUninitialized: false,
+	store: new MongoStore({
+		mongooseConnection: db //db must first be defined.
+	})
+}));
+
+
+
 if(config.util.getEnv('NODE_ENV') !== 'test') {
 	app.use(logger('dev'));
 }
@@ -67,7 +80,7 @@ app.use('/api/users', user);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
-	var err = new Error('Not Found');
+	const err = new Error('Not Found');
 	err.status = 404;
 	next(err);
 });
@@ -78,7 +91,7 @@ app.use(function(err, req, res, next) {
 	res.locals.message = err.message;
 	res.locals.error = req.app.get('env') === 'development' ? err : {};
 
-	let status = err.status || 500;
+	const status = err.status || 500;
 	// render the error page
 	res.status(status).json({success: false, status: status, message: err.message});
 });

src/app.js

@@ -6,7 +6,8 @@ import {authorizeUser} from "../middleware/index";
 /* GET home page. */
 router.get('/', authorizeUser, (req, res, next) => {
 	console.log(req.session.userId);
-	res.send('test');
+	let status = 200;
+	res.status(status).json({success: true, message: "User Successfully retrieved", status: status});
 });
 
 

src/routes/user.js

@@ -10,21 +10,57 @@ const should = chai.should();
 const expect = chai.expect;
 
 const postAPI = '/api/users';
+const getAPI = postAPI;
 
 
 describe('Users', () => {
-	beforeEach((done) => {
-		User.remove({}, (err) => {
-			done();
-		});
-	});
 
 	describe('/GET users', () => {
-		//it('shoul')
+		it('should not GET if auth headers are missing', (done) => {
+			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();
+				});
+		});
+		it('should not GET if auth headers supplied are invalid', (done) => {
+			let auth = {
+				user: 'user@notValidEmail.com',
+				pass: 'notValidPass'
+			};
+			getAuthRequest(auth, 401, false, "Access Denied: Wrong email or password", done);
+		});
 
+		it('should GET if auth headers are present', (done) => {
+			let auth = {
+				user: 'joe@smith.com',
+				pass: 'password'
+			};
+			getAuthRequest(auth, 200, true, "User Successfully retrieved", done);
+		});
+		
+		function getAuthRequest(auth, status, success, msg, done){
+			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);
+					done();
+				});
+		}
 	});
 
 	describe('/POST users', () => {
+		beforeEach((done) => {
+			User.remove({}, (err) => {
+				done();
+			});
+		});
 		let user400 = {
 			emailAddress: 'wre23sd',
 			password: 'password',
@@ -96,6 +132,7 @@ describe('Users', () => {
 				.send(user)
 				.end((err, res) => {
 					res.should.have.status(422);
+					res.body.should.have.property('success').equal(false);
 					done();
 				});
 		}
@@ -106,6 +143,7 @@ describe('Users', () => {
 				.end((err, res) => {
 					res.should.have.status(400);
 					res.body.should.have.property('message').equal("Malformed Email Supplied");
+					res.body.should.have.property('success').equal(false);
 					done();
 				});
 		}