made appid, userid and developerid requirment optional

Author: iolufemi

TODO.md

@@ -1,6 +1,6 @@
 ### TODOs
 | Filename | line # | TODO
 |:------|:------:|:------
-| routes/index.js | 228 | Implement API Generator
+| routes/index.js | 229 | Implement API Generator
 | routes/users.js | 43 | Test users route
 | services/queue/clock.js | 11 | work on a clock functionality so kue can support scheduled jobs

config/development.js

@@ -20,5 +20,6 @@ module.exports = {
     gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '2207558a1d72eefa8d836404e4dc2dc07bc46772',
     queueUIUsername: process.env.QUEUE_UI_USERNAME || 'admin',
     queueUIPassword: process.env.QUEUE_UI_PASSWORD || 'password123/',
-    queueUIPort: process.env.QUEUE_UI_PORT || 3000
+    queueUIPort: process.env.QUEUE_UI_PORT || 3000,
+    enforceUserIdAppIdDeveloperId: process.env.ENFORCE_USER_ID_APP_ID_DEVELOPER_ID || 'yes'
 };

config/production.js

@@ -20,5 +20,6 @@ module.exports = {
     gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '2207558a1d72eefa8d836404e4dc2dc07bc46772',
     queueUIUsername: process.env.QUEUE_UI_USERNAME || 'admin',
     queueUIPassword: process.env.QUEUE_UI_PASSWORD || 'password123/',
-    queueUIPort: process.env.QUEUE_UI_PORT || 3000
+    queueUIPort: process.env.QUEUE_UI_PORT || 3000,
+    enforceUserIdAppIdDeveloperId: process.env.ENFORCE_USER_ID_APP_ID_DEVELOPER_ID || 'yes'
 };

routes/index.js

@@ -30,7 +30,7 @@ router._sanitizeRequestUrl = function(req) {
     host: req.hostname,
     pathname: req.originalUrl || req.url,
     query: req.query
-});
+  });
 
   return requestUrl.replace(/(password=).*?(&|$)/ig, '$1<hidden>$2');
 };
@@ -41,13 +41,13 @@ router._allRequestData = function(req,res,next){
     var newRequestData = _.assignIn(requestData, req.params, req.body, req.query);
     if(newRequestData[key]){
       return newRequestData[key];
-  }else if(defaultValue){
+    }else if(defaultValue){
       return defaultValue;
-  }else{
+    }else{
       return false;
-  }
-};
-next();
+    }
+  };
+  next();
 };
 
 router._enforceUserIdAndAppId = function(req,res,next){
@@ -56,11 +56,11 @@ router._enforceUserIdAndAppId = function(req,res,next){
   var developer = req.param('developer');
   if(!userId){
     return res.badRequest(false,'No userId parameter was passed in the payload of this request. Please pass a userId.');
-}else if(!appId){
+  }else if(!appId){
     return res.badRequest(false,'No appId parameter was passed in the payload of this request. Please pass an appId.');
-}else if(!developer){
+  }else if(!developer){
     return res.badRequest(false,'No developer parameter was passed in the payload of this request. Please pass a developer id.');
-}else{
+  }else{
     req.userId = userId;
     req.appId = appId;
     req.developer = developer;
@@ -69,7 +69,7 @@ router._enforceUserIdAndAppId = function(req,res,next){
     req.body.createdBy = userId;
     req.body.developer = developer;
     next();
-}
+  }
 };
 
 router._APICache = function(req,res,next){
@@ -85,11 +85,11 @@ router._APICache = function(req,res,next){
   key.push(req.get('user-agent'));
   if(req.userId){
     key.push(req.userId);
-}
-if(req.appId){
+  }
+  if(req.appId){
     key.push(req.appId);
-}
-req.cacheKey = key;
+  }
+  req.cacheKey = key;
   // Remember to delete cache when you get a POST call
   // Only cache GET calls
   if(req.method === 'GET'){
@@ -99,22 +99,22 @@ req.cacheKey = key;
       if(!resp){
         // Will be set on successful response
         next();
-    }else{
+      }else{
         res.ok(resp, true);
-    }
-})
+      }
+    })
     .catch(function(err){
       log.error('Failed to get cached data: ', err);
       // Don't block the call because of this failure.
       next();
-  });
-}else{
+    });
+  }else{
     if(req.method === 'POST' || req.method === 'PUT' || req.method === 'PUSH'){
       req.cache.del(req.cacheKey)
       .then(); // No delays
+    }
+    next();
   }
-  next();
-}
 
 };
 
@@ -134,7 +134,7 @@ router.use(function(req,res,next){
     user: req.userId,
     device: req.get('user-agent'),
     createdAt: new Date()
-};
+  };
 
 // Dump it in the queue
 queue.create('logRequest', reqLog)
@@ -172,7 +172,7 @@ limiter({
   expire: config.rateLimitExpiry * 1,
   onRateLimited: function (req, res, next) {
     next({ message: 'Rate limit exceeded', statusCode: 429 });
-}
+  }
 });
 
 
@@ -200,21 +200,22 @@ router.use('/', initialize);
 // 
 // 
 
-
-// Make userId compolsory in every request
-router.use(router._enforceUserIdAndAppId);
+if(config.enforceUserIdAppIdDeveloperId === 'yes'){
+  // Make userId compolsory in every request
+  router.use(router._enforceUserIdAndAppId);
+}
 
 // Should automatically load routes
 // Other routes here
 var ourRoutes = {};
 var normalizedPath = require("path").join(__dirname, "./");
 
 require("fs").readdirSync(normalizedPath).forEach(function(file) {
-    var splitFileName = file.split('.');
-    if(splitFileName[0] !== 'index' && splitFileName[0] !== 'initialize'){
-        ourRoutes[splitFileName[0]] = require('./'+splitFileName[0]);
-        router.use('/', ourRoutes[splitFileName[0]]);
-    }
+  var splitFileName = file.split('.');
+  if(splitFileName[0] !== 'index' && splitFileName[0] !== 'initialize'){
+    ourRoutes[splitFileName[0]] = require('./'+splitFileName[0]);
+    router.use('/', ourRoutes[splitFileName[0]]);
+  }
 });
 
 router.use(function(req, res, next) { // jshint ignore:line