Merge pull request #1681 from zaach/dev

Fix globals that were being unintentionally created in wsapi.js

Nice catch and great work on this @zaach.  r+

lib/bcrypt.js

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const
+path = require('path'),
 computecluster = require('compute-cluster'),
 logger = require('../lib/logging.js').logger,
 bcrypt = require('bcrypt'),

lib/browserid/views.js

@@ -12,7 +12,8 @@ config = require('../configuration.js'),
 und = require('underscore'),
 util = require('util'),
 httputils = require('../httputils.js'),
-etagify = require('etagify');
+etagify = require('etagify'),
+secrets = require('../secrets');
 
 // all templated content, redirects, and renames are handled here.
 // anything that is not an api, and not static

lib/wsapi.js

@@ -17,7 +17,7 @@
 
 const
 sessions = require('client-sessions'),
-express = require('express');
+express = require('express'),
 secrets = require('./secrets'),
 config = require('./configuration'),
 logger = require('./logging.js').logger,
@@ -27,8 +27,8 @@ url = require('url'),
 fs = require('fs'),
 path = require('path'),
 validate = require('./validate'),
-statsd = require('./statsd');
-bcrypt = require('./bcrypt');
+statsd = require('./statsd'),
+bcrypt = require('./bcrypt'),
 i18n = require('./i18n');
 
 var abide = i18n.abide({

lib/wsapi/address_info.js

@@ -5,7 +5,9 @@
 const
 db = require('../db.js'),
 primary = require('../primary.js'),
-wsapi = require('../wsapi.js');
+wsapi = require('../wsapi.js'),
+httputils = require('../httputils.js'),
+url = require('url');
 
 // return information about an email address.
 //   type:  is this an address with 'primary' or 'secondary' support?

lib/wsapi/auth_with_assertion.js

@@ -10,7 +10,8 @@ logger = require('../logging.js').logger,
 querystring = require('querystring'),
 primary = require('../primary.js'),
 http = require('http'),
-https = require('https');
+https = require('https'),
+config = require('../configuration');
 
 exports.method = 'post';
 exports.writes_db = false;

lib/wsapi/authenticate_user.js

@@ -11,7 +11,8 @@ bcrypt = require('../bcrypt'),
 http = require('http'),
 https = require('https'),
 querystring = require('querystring'),
-statsd = require('../statsd');
+statsd = require('../statsd'),
+config = require('../configuration');
 
 exports.method = 'post';
 exports.writes_db = false;

lib/wsapi/complete_email_addition.js

@@ -6,7 +6,8 @@ const
 db = require('../db.js'),
 logger = require('../logging.js').logger,
 wsapi = require('../wsapi.js'),
-brycpt = require('../bcrypt.js');
+bcrypt = require('../bcrypt.js'),
+httputils = require('../httputils.js');
 
 exports.method = 'post';
 exports.writes_db = true;

lib/wsapi/have_email.js

@@ -4,7 +4,8 @@
 
 const
 db = require('../db.js'),
-wsapi = require('../wsapi.js');
+wsapi = require('../wsapi.js'),
+url = require('url');
 
 // return if an email is known to browserid
 

lib/wsapi/session_context.js

@@ -8,7 +8,8 @@ logger = require('../logging.js').logger,
 crypto = require('crypto'),
 wsapi = require('../wsapi.js'),
 secrets = require('../secrets.js'),
-version = require('../version.js');
+version = require('../version.js'),
+config = require('../configuration.js');
 
 // return the CSRF token, authentication status, and current server time (for assertion signing)
 // 2011-12-22: adding a random seed for keygen