reformats on some files; updated demographicsPyramidVis to use groups…

… instead of older clinic.

lib/auth.js

@@ -1,37 +1,37 @@
 'use strict';
-var async = require('async'),
-    _ = require('lodash'),
-    logger = require('./logger'),
+var async   = require('async'),
+    _       = require('lodash'),
+    logger  = require('./logger'),
     request = require('request'),
-    util = require('util');
+    util    = require('util');
 
 function getBakedCookie(juri, user, pass, next) {
 
     logger.log('GET_BAKED_COOKIE: calling - ' + process.env.AUTH_CONTROL_URL + '/auth/login');
 
     request
         .post({
-            url: process.env.AUTH_CONTROL_URL + '/auth/login',
+            url : process.env.AUTH_CONTROL_URL + '/auth/login',
             form: {
-                juri: juri,
-                user: user,
-                pass: pass,
+                juri   : juri,
+                user   : user,
+                pass   : pass,
                 respond: "1"
             },
 
             json: true
 
-        }, function(err, res, body){
+        }, function (err, res, body) {
 
-            if(err){
+            if (err) {
 
                 handleAuthResponse(404, null, null, next)
 
-            }else if ( res && body && body.data ){
+            } else if (res && body && body.data) {
 
                 handleAuthResponse(err, res, body, next)
 
-            }else{
+            } else {
 
                 handleAuthResponse(err, res, body, next)
 
@@ -40,22 +40,22 @@ function getBakedCookie(juri, user, pass, next) {
         });
 }
 
-/** 
-* Determines whether a cookie is valid by passing it to
-* the auth component for verification.
-* 
-* 
-* @param bakedCookie {String} - the cookie that was passed from the browser
-* @param next {Function} - The function to call after we are done the work here. 
-*   Function should have prototype like: Function foo(err, data) 
-*       - Where err is the  status code returned from the auth component and data is the data object. 
-*       - If there was an error the data field will be set to null. 
-*       - If there was no error (a valid response) then the error field will be null. 
-*/
+/**
+ * Determines whether a cookie is valid by passing it to
+ * the auth component for verification.
+ *
+ *
+ * @param bakedCookie {String} - the cookie that was passed from the browser
+ * @param next {Function} - The function to call after we are done the work here.
+ *   Function should have prototype like: Function foo(err, data)
+ *       - Where err is the  status code returned from the auth component and data is the data object.
+ *       - If there was an error the data field will be set to null.
+ *       - If there was no error (a valid response) then the error field will be null.
+ */
 function verifyAuth(bakedCookie, next) {
 
     request.post({
-        url: process.env.AUTH_CONTROL_URL + '/verify',
+        url : process.env.AUTH_CONTROL_URL + '/verify',
         form: {
             bakedCookie: bakedCookie
         },
@@ -65,46 +65,46 @@ function verifyAuth(bakedCookie, next) {
 
         //an error here probably means we couldn't contact 
         //auth
-        if( err ){
+        if (err) {
 
-            return handleAuthResponse(404, null, null, next); 
+            return handleAuthResponse(404, null, null, next);
 
-        }else if ( body && body.data ){
+        } else if (body && body.data) {
 
-            return handleAuthResponse(err, res, body.data, next); 
+            return handleAuthResponse(err, res, body.data, next);
 
-        }else{
+        } else {
 
-            return handleAuthResponse(err, res, body, next); 
+            return handleAuthResponse(err, res, body, next);
         }
 
     });
 }
 
 /**
-* Handles the response from the auth component. This is set up
-* to handle the response based on the status code that auth returns. 
-* 
-* This function then invokes the next that is passed in. 
-*
-* @param err {Object} - An error object from auth.
-* @param res {Object} - Response object from the request library.
-* @param body {Object} - The data returned from auth. 
-* @param next {Funciton} - the next function to call. Has prototype like: 
-*   Function foo(err, data) 
-*       - Where err is the  status code returned from the auth component and data is the data object. 
-*       - If there was an error the data field will be set to null. 
-*       - If there was no error (a valid response) then the error field will be null. 
-*/
-function handleAuthResponse (err, res, body, next){
-
-    var x = null; 
-
-    if ( res ){
-
-        x = res.statusCode || err; 
-
-    }else{
+ * Handles the response from the auth component. This is set up
+ * to handle the response based on the status code that auth returns.
+ *
+ * This function then invokes the next that is passed in.
+ *
+ * @param err {Object} - An error object from auth.
+ * @param res {Object} - Response object from the request library.
+ * @param body {Object} - The data returned from auth.
+ * @param next {Funciton} - the next function to call. Has prototype like:
+ *   Function foo(err, data)
+ *       - Where err is the  status code returned from the auth component and data is the data object.
+ *       - If there was an error the data field will be set to null.
+ *       - If there was no error (a valid response) then the error field will be null.
+ */
+function handleAuthResponse(err, res, body, next) {
+
+    var x = null;
+
+    if (res) {
+
+        x = res.statusCode || err;
+
+    } else {
 
         x = err;
     }
@@ -113,45 +113,45 @@ function handleAuthResponse (err, res, body, next){
     //using this we can handle various response codes.
     //currently all error/failures are handled the same way,
     // but we might want to change this in the future. 
-    switch( x ){
+    switch (x) {
 
-        case 200: 
+        case 200:
 
-            if( body ){
+            if (body) {
 
-                next(null, body); 
+                next(null, body);
 
-            }else{
+            } else {
 
-               logger.warn("auth.handleAuthResponse() : body returned from auth was not valid : "+util.inspect(body, false ,null)); 
-                next(500, null); 
+                logger.warn("auth.handleAuthResponse() : body returned from auth was not valid : " + util.inspect(body, false, null));
+                next(500, null);
 
             }
 
-            break; 
+            break;
 
         case 400:
-            logger.warn("auth.handleAuthResponse() : request to auth component was not well formed: "+util.inspect(err, false ,null)); 
-            next(400, null); 
-            break; 
+            logger.warn("auth.handleAuthResponse() : request to auth component was not well formed: " + util.inspect(err, false, null));
+            next(400, null);
+            break;
 
         case 401:
-            logger.warn("auth.handleAuthResponse() : Invalid credentials provided. error was: "+util.inspect(err, false, null)); 
-            next(401, null); 
-            break; 
+            logger.warn("auth.handleAuthResponse() : Invalid credentials provided. error was: " + util.inspect(err, false, null));
+            next(401, null);
+            break;
 
         case 404:
             logger.warn("auth.handleAuthResopnse() : Could not contact auth server.");
             next(404, null);
             break;
 
         case 500:
-            logger.error("auth.handleAuthResponse() : received a server error from auth : "+util.inspect(err, false , null)); 
-            next(500, null); 
+            logger.error("auth.handleAuthResponse() : received a server error from auth : " + util.inspect(err, false, null));
+            next(500, null);
             break;
 
         default:
-            logger.warn("auth.handleAuthResponse() : Not sure how to handle statusCode: "+res.statusCode);
+            logger.warn("auth.handleAuthResponse() : Not sure how to handle statusCode: " + res.statusCode);
             next(res.statusCode, null);
             break;
 
@@ -161,5 +161,5 @@ function handleAuthResponse (err, res, body, next){
 
 module.exports = {
     getBakedCookie: getBakedCookie,
-    verifyAuth: verifyAuth
+    verifyAuth    : verifyAuth
 };