From 58ce037da9ee61181b39fa47de60b91dc0e29bf0 Mon Sep 17 00:00:00 2001
From: Zachary Carter <zack.carter@gmail.com>
Date: Wed, 6 Jun 2012 16:22:29 -0700
Subject: [PATCH] Clean up remaining references to global or undefined
variables - issue #1701
---
lib/browserid/fake_verification.js | 4 ++--
lib/browserid/views.js | 2 +-
lib/db/mysql.js | 4 +++-
lib/i18n.js | 12 ++++++------
lib/load_gen/common.js | 2 +-
lib/static_resources.js | 2 +-
lib/wsapi/address_info.js | 3 ++-
lib/wsapi/complete_user_creation.js | 3 ++-
lib/wsapi/stage_email.js | 3 ++-
lib/wsapi/stage_user.js | 3 ++-
lib/wsapi_client.js | 3 ++-
tests/i18n-tests.js | 6 +++---
12 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/lib/browserid/fake_verification.js b/lib/browserid/fake_verification.js
index 03f33f1c1..b9e3a211c 100644
--- a/lib/browserid/fake_verification.js
+++ b/lib/browserid/fake_verification.js
@@ -11,7 +11,7 @@
const
configuration = require('../configuration.js'),
url = require('url'),
-db = require('../db.js');
+db = require('../db.js'),
logger = require('../logging.js').logger,
wsapi = require('../wsapi');
@@ -22,7 +22,7 @@ exports.addVerificationWSAPI = function(app) {
app.get('/wsapi/fake_verification', function(req, res) {
var email = url.parse(req.url, true).query['email'];
db.verificationSecretForEmail(email, function(err, secret) {
- if (err) return wsapi.databaseDown(resp, err);
+ if (err) return wsapi.databaseDown(res, err);
if (secret) res.write(secret);
else res.writeHead(400, {"Content-Type": "text/plain"});
res.end();
diff --git a/lib/browserid/views.js b/lib/browserid/views.js
index 1fc696fb6..c49897a30 100644
--- a/lib/browserid/views.js
+++ b/lib/browserid/views.js
@@ -178,7 +178,7 @@ exports.setup = function(app) {
}
// REDIRECTS
- REDIRECTS = {
+ const REDIRECTS = {
"/manage": "/",
"/users": "/",
"/users/": "/",
diff --git a/lib/db/mysql.js b/lib/db/mysql.js
index 8c2d805e6..f9d37b753 100644
--- a/lib/db/mysql.js
+++ b/lib/db/mysql.js
@@ -29,6 +29,8 @@
* +------------------------+
*/
+/*global dne:true */
+
const
mysql = require('./mysql_wrapper.js'),
secrets = require('../secrets.js'),
@@ -456,7 +458,7 @@ exports.updatePassword = function(uid, hash, cb) {
[ hash, uid ],
function (err, rows) {
if (!err && (!rows || rows.affectedRows !== 1)) {
- err = "no record with email " + email;
+ err = "no record with id " + uid;
}
cb(err);
});
diff --git a/lib/i18n.js b/lib/i18n.js
index 45944b200..7b2d214d9 100644
--- a/lib/i18n.js
+++ b/lib/i18n.js
@@ -115,7 +115,7 @@ exports.abide = function (options) {
if (mo_cache[locale].mo_exists) {
if (mo_cache[locale].gt === null) {
mo_cache[locale].gt = new Gettext();
- mo_path = mo_file_path(locale);
+ var mo_path = mo_file_path(locale);
mo_cache[locale].gt.addTextdomain(locale,
fs.readFileSync(mo_path));
mo_cache[locale].gt.textdomain(locale);
@@ -153,7 +153,7 @@ function qualityCmp(a, b) {
* lang: 'pl', quality: 0.7
* }
*/
-exports.parseAcceptLanguage = parseAcceptLanguage = function (header) {
+var parseAcceptLanguage = exports.parseAcceptLanguage = function (header) {
// pl,fr-FR;q=0.3,en-US;q=0.1
if (! header || ! header.split) {
return [];
@@ -163,7 +163,7 @@ exports.parseAcceptLanguage = parseAcceptLanguage = function (header) {
var parts = raw_lang.split(';');
var q = 1;
if (parts.length > 1 && parts[1].indexOf('q=') == 0) {
- qval = parseFloat(parts[1].split('=')[1]);
+ var qval = parseFloat(parts[1].split('=')[1]);
if (isNaN(qval) === false) {
q = qval;
}
@@ -179,7 +179,7 @@ exports.parseAcceptLanguage = parseAcceptLanguage = function (header) {
// supported languages, returns the best match or a default language.
//
// languages must be a sorted list, the first match is returned.
-exports.bestLanguage = bestLanguage = function(languages, supported_languages, defaultLanguage) {
+var bestLanguage = exports.bestLanguage = function(languages, supported_languages, defaultLanguage) {
var lower = supported_languages.map(function (l) { return l.toLowerCase(); });
for(var i=0; i < languages.length; i++) {
var lq = languages[i];
@@ -199,7 +199,7 @@ exports.bestLanguage = bestLanguage = function(languages, supported_languages, d
* language: en-US
* locale: en_US
*/
-exports.localeFrom = localeFrom = function (language) {
+var localeFrom = exports.localeFrom = function (language) {
if (! language || ! language.split) {
return "";
}
@@ -248,7 +248,7 @@ exports.languageFrom = function (locale) {
* Positional Example:
* format("%s %s", ["Hello", "World"]);
*/
-exports.format = format = function (fmt, obj, named) {
+var format = exports.format = function (fmt, obj, named) {
if (! fmt) return "";
if (named) {
return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])});
diff --git a/lib/load_gen/common.js b/lib/load_gen/common.js
index 59758e21e..b02f17aea 100644
--- a/lib/load_gen/common.js
+++ b/lib/load_gen/common.js
@@ -97,7 +97,7 @@ exports.genAssertionAndVerify = function(cfg, user, ctx, email, audience, cb) {
}, function (err, r) {
try {
if (err) throw err;
- if (r.code !== 200) throw "non-200 status: " + resp.code;
+ if (r.code !== 200) throw "non-200 status: " + r.code;
if (!JSON.parse(r.body).status === 'okay') throw "verification failed with: " + r.reason;
cb(undefined);
} catch(e) {
diff --git a/lib/static_resources.js b/lib/static_resources.js
index ad17eac88..c146dbb34 100644
--- a/lib/static_resources.js
+++ b/lib/static_resources.js
@@ -178,7 +178,7 @@ exports.all = function(langs) {
/**
* Get all resource urls for a specified resource based on the locale
*/
-exports.getResources = getResources = function(path, locale) {
+var getResources = exports.getResources = function(path, locale) {
var res = [];
if (exports.resources[path]) {
exports.resources[path].forEach(function(r) {
diff --git a/lib/wsapi/address_info.js b/lib/wsapi/address_info.js
index e65f93993..16943822d 100644
--- a/lib/wsapi/address_info.js
+++ b/lib/wsapi/address_info.js
@@ -7,7 +7,8 @@ db = require('../db.js'),
primary = require('../primary.js'),
wsapi = require('../wsapi.js'),
httputils = require('../httputils.js'),
-url = require('url');
+url = require('url'),
+logger = require('../logging.js').logger;
// return information about an email address.
// type: is this an address with 'primary' or 'secondary' support?
diff --git a/lib/wsapi/complete_user_creation.js b/lib/wsapi/complete_user_creation.js
index 5b87c3ec9..eab3381d8 100644
--- a/lib/wsapi/complete_user_creation.js
+++ b/lib/wsapi/complete_user_creation.js
@@ -7,7 +7,8 @@ db = require('../db.js'),
wsapi = require('../wsapi.js'),
httputils = require('../httputils'),
logger = require('../logging.js').logger,
-bcrypt = require('../bcrypt');
+bcrypt = require('../bcrypt'),
+config = require('../configuration');
exports.method = 'post';
exports.writes_db = true;
diff --git a/lib/wsapi/stage_email.js b/lib/wsapi/stage_email.js
index 60129ddcc..9ad39e994 100644
--- a/lib/wsapi/stage_email.js
+++ b/lib/wsapi/stage_email.js
@@ -8,7 +8,8 @@ wsapi = require('../wsapi.js'),
httputils = require('../httputils'),
logger = require('../logging.js').logger,
email = require('../email.js'),
-sanitize = require('../sanitize');
+sanitize = require('../sanitize'),
+config = require('../configuration');
/* First half of account creation. Stages a user account for creation.
* this involves creating a secret url that must be delivered to the
diff --git a/lib/wsapi/stage_user.js b/lib/wsapi/stage_user.js
index ff1dd24bf..5337580dd 100644
--- a/lib/wsapi/stage_user.js
+++ b/lib/wsapi/stage_user.js
@@ -8,7 +8,8 @@ wsapi = require('../wsapi.js'),
httputils = require('../httputils'),
logger = require('../logging.js').logger,
email = require('../email.js'),
-sanitize = require('../sanitize');
+sanitize = require('../sanitize'),
+config = require('../configuration');
/* First half of account creation. Stages a user account for creation.
* this involves creating a secret url that must be delivered to the
diff --git a/lib/wsapi_client.js b/lib/wsapi_client.js
index c6ae5bd42..81dbce7e0 100644
--- a/lib/wsapi_client.js
+++ b/lib/wsapi_client.js
@@ -43,7 +43,7 @@ exports.clearCookies = function(ctx) {
};
exports.getCookie = function(ctx, which) {
- if (typeof which === 'string') which = new Regex('/^' + which + '$/');
+ if (typeof which === 'string') which = new RegExp('/^' + which + '$/');
var cookieNames = Object.keys(ctx.cookieJar);
for (var i = 0; i < cookieNames.length; i++) {
if (which.test(cookieNames[i])) return ctx.cookieJar[cookieNames[i]];
@@ -114,6 +114,7 @@ exports.post = function(cfg, path, context, postArgs, cb) {
// parse the server URL (cfg.browserid)
var uObj;
var meth;
+ var body;
try {
uObj = url.parse(cfg.browserid);
meth = uObj.protocol === 'http:' ? http : https;
diff --git a/tests/i18n-tests.js b/tests/i18n-tests.js
index 4add4f433..9001546ba 100755
--- a/tests/i18n-tests.js
+++ b/tests/i18n-tests.js
@@ -61,7 +61,7 @@ suite.addBatch({
var supported = ['af', 'en-US', 'pa'];
var def = 'en-US';
return i18n.bestLanguage(
- parseAcceptLanguage(accept),
+ i18n.parseAcceptLanguage(accept),
supported, def);
},
"For Punjabi": function (err, locale) {
@@ -74,7 +74,7 @@ suite.addBatch({
var supported = ['af', 'en-US', 'pa'];
var def = 'en-US';
return i18n.bestLanguage(
- parseAcceptLanguage(accept),
+ i18n.parseAcceptLanguage(accept),
supported, def);
},
"For Punjabi (India) serve Punjabi": function (err, locale) {
@@ -87,7 +87,7 @@ suite.addBatch({
var supported = ['af', 'en-US', 'pa-IT'];
var def = 'en-US';
return i18n.bestLanguage(
- parseAcceptLanguage(accept),
+ i18n.parseAcceptLanguage(accept),
supported, def);
},
"Don't choose Punjabi (India)": function (err, locale) {
--
GitLab