cleaning up actions; adding better web service friendly req logging. Fixing spaces in crowd authentication.

Author: rcreasey

config/settings.js

@@ -1,6 +1,3 @@
-'use strict';
-var mongoose = require('mongoose');
-
 module.exports = function () {
 
 	var getSetting = function (setting) {
@@ -28,9 +25,9 @@ module.exports = function () {
 
 		port: getSetting('PORT'),
 		cookieSecret: getSetting('COOKIE_SECRET'),
-		log: 'console',
 		sessionSecret: getSetting('SESSION_SECRET'),
-		
+		log: 'console',
+
 		hostileTtl: 900000,
 		memberTtl: 60000,
 		armadaTtl: 43200000,

lib/actions/createAction.js

@@ -3,7 +3,7 @@ module.exports = function (armadaService, memberService, sessionService, eventSe
 	var pub = {};
 
 	pub.run = function (req, res) {
-		logger.log('Processing \'create\' request', 0);
+		logger.processing(req);
 
 		sessionService.checkIfValid(req, function (error, isValid) {
 			if (isValid) {

lib/actions/indexAction.js

@@ -3,7 +3,7 @@ module.exports = function (logger) {
   var pub = {};
 
   pub.run = function (req, res) {
-    logger.log('Processing \'index\' request', 0)
+    logger.processing(req);
     res.render('main', { user: req.user });
   };
 

lib/actions/joinAction.js

@@ -3,6 +3,8 @@ module.exports = function (errorResponse, successResponse, headerParser, memberS
 	var pub = {};
 
 	pub.run = function (req, res) {
+		logger.processing(req);
+
 		if (req.params.armadaPassword ) {
 			logger.log('Processing \'join\' request with password', 0)
 		} else {

lib/actions/leaveAction.js

@@ -3,7 +3,7 @@ module.exports = function (successResponse, errorResponse, memberService, eventS
 	var pub = {};
 
 	pub.run = function (req, res) {
-		logger.log('Processing \'leave\' request', 0);
+		logger.processing(req);
 
 		sessionService.checkIfValid(req, function (error, isValid) {
 			if (!isValid) {

lib/actions/linkAction.js

@@ -3,7 +3,8 @@ module.exports = function (logger) {
   var pub = {};
 
   pub.run = function (req, res) {
-    logger.log('Processing \'link\' request', 0)
+    logger.processing(req);
+
     res.render('link', { user: req.user, linked: req.session.linked, error: req.flash('error') });
   };
 

lib/actions/loginAction.js

@@ -1,9 +1,18 @@
-module.exports = function (logger) {
+module.exports = function (passport, logger) {
 
   var pub = {};
 
+
+  pub.authenticate = function (req, res) {
+    logger.processing(req);
+    logger.log('trying to passport')
+    passport.authenticate('atlassian-crowd', { failureRedirect:'/login', failureFlash:"Invalid username or password." })
+    res.redirect('/link');
+  };
+
   pub.run = function (req, res) {
-    logger.log('Processing \'login\' request', 0);
+    logger.processing(req);
+
     res.render('login', { user: req.user, error: req.flash('error') });
   };
 

lib/actions/logoutAction.js

@@ -0,0 +1,17 @@
+module.exports = function (logger) {
+
+  var pub = {};
+
+  pub.run = function (req, res) {
+    logger.processing(req);
+
+    if (req.session.passport.user) {
+      req.flash('error', 'Logging out pilot ' + req.session.passport.user);
+    }
+
+    req.logout();
+    res.redirect('/');
+  };
+
+  return pub;
+};

lib/actions/pollAction.js

@@ -103,7 +103,7 @@ module.exports = function (successResponse, errorResponse, headerParser, session
 	};
 
 	pub.run = function (req, res) {
-		logger.log('Processing \'poll\' request', 0);
+		logger.processing(req);
 
 		memberService.getByKey(req.session.memberKey, function (error, oldState) {
 			if (error) return errorResponse.respond(req, res, 'get', error);

lib/actions/postDetailsAction.js

@@ -16,7 +16,7 @@ module.exports = function (hostileService, eventService, headerParser, errorResp
   };
 
   pub.run = function (req, res) {
-    logger.log('Processing post \'details\' request', 0);
+    logger.processing(req);
 
     var pilot = req.body.scanData;