Merge branch 'darachcawley-pr-timeout'

raincatcher-beta · Jun 15, 2017 · d9502de · d9502de
2 parents 4b6e11b + deb2d6b
commit d9502de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/cloud/user/mbaas-service-proxy.js b/lib/cloud/user/mbaas-service-proxy.js
@@ -1,6 +1,7 @@
 var q = require('q')
   , $fh = require('fh-mbaas-api')
-  , _ = require('lodash');
+  , _ = require('lodash')
+  , config = require('../../config/config-user');
 
 /**
  * Proxy for calling MBaaS Service API
@@ -26,7 +27,8 @@ MbaasServiceProxy.prototype.xhr = function(_options) {
   var defaultOptions = {
     guid: this.guid,
     path: '/api/wfm/user',
-    method: 'GET'
+    method: 'GET',
+    timeout: config.requestTimeout
   };
 
   var options = _.defaults(_options, defaultOptions);

diff --git a/lib/config/config-user.js b/lib/config/config-user.js
@@ -6,5 +6,6 @@ module.exports = {
   authpolicyPath: '/box/srv/1.1/admin/authpolicy',
   policyId: process.env.WFM_AUTH_POLICY_ID || 'wfm',
   defaultProfileDataExclusionList: ['password'],
-  sessionTokenExpiry: 1800
+  sessionTokenExpiry: process.env.WFM_TOKEN_EXPIRY || 1800,
+  requestTimeout: process.env.WFM_REQUEST_TIMEOUT || 25000
 };
diff --git a/lib/mbaas/session/mongoProvider.js b/lib/mbaas/session/mongoProvider.js
@@ -20,6 +20,7 @@ module.exports = {
     this.db.collection('sessions').findOne({
       '_id': token
     }, function(err, foundSession) {
+      foundSession = foundSession || {};
       //For the session to be valid, the expiry date must be greater than now.
       var valid = !err && foundSession && new Date() < new Date(foundSession.expires);
       foundSession.isValid = valid;