From f32b64b4494b99f1e27892c6a8e1b30ddab494eb Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Tue, 22 Nov 2011 15:36:33 -0700
Subject: [PATCH] (loadgen) rename prepare.js to common.js as it holds common
processes used by multiple different activities - issue #504
---
lib/load_gen/activities/add_email.js | 8 ++++----
lib/load_gen/activities/signin.js | 6 +++---
lib/load_gen/activities/signup.js | 4 ++--
lib/load_gen/{prepare.js => common.js} | 0
4 files changed, 9 insertions(+), 9 deletions(-)
rename lib/load_gen/{prepare.js => common.js} (100%)
diff --git a/lib/load_gen/activities/add_email.js b/lib/load_gen/activities/add_email.js
index aa12ba00d..6ec6a4bd8 100644
--- a/lib/load_gen/activities/add_email.js
+++ b/lib/load_gen/activities/add_email.js
@@ -41,7 +41,7 @@ const
wcli = require("../../wsapi_client.js"),
userdb = require("../user_db.js"),
winston = require('winston'),
-prepare = require('../prepare.js');
+common = require('../common.js');
exports.startFunc = function(cfg, cb) {
// 1. RP includes include.js
@@ -80,7 +80,7 @@ exports.startFunc = function(cfg, cb) {
var origin = userdb.any(user.sites);
- prepare.auth(cfg, user, context, user.emails[0], function(err) {
+ common.auth(cfg, user, context, user.emails[0], function(err) {
if (err) return cb(err);
// stage them
wcli.post(cfg, '/wsapi/stage_email', context, {
@@ -133,9 +133,9 @@ exports.startFunc = function(cfg, cb) {
}
// now generate a key
- prepare.authAndKey(cfg, user, context, email, function(err) {
+ common.authAndKey(cfg, user, context, email, function(err) {
if (err) return cb(err);
- prepare.genAssertionAndVerify(cfg, user, context, email, origin, function(err) {
+ common.genAssertionAndVerify(cfg, user, context, email, origin, function(err) {
cb(err);
});
});
diff --git a/lib/load_gen/activities/signin.js b/lib/load_gen/activities/signin.js
index e75613f13..72be75773 100644
--- a/lib/load_gen/activities/signin.js
+++ b/lib/load_gen/activities/signin.js
@@ -43,7 +43,7 @@ wcli = require("../../wsapi_client.js"),
userdb = require("../user_db.js"),
winston = require('winston'),
crypto = require('../crypto'),
-prepare = require('../prepare');
+common = require('../common');
exports.startFunc = function(cfg, cb) {
@@ -79,9 +79,9 @@ exports.startFunc = function(cfg, cb) {
var origin = userdb.any(user.sites);
// establish session context and authenticate if needed
- prepare.authAndKey(cfg, user, context, email, function(err) {
+ common.authAndKey(cfg, user, context, email, function(err) {
if (err) return cb(err);
- prepare.genAssertionAndVerify(cfg, user, context, email, origin, function(err) {
+ common.genAssertionAndVerify(cfg, user, context, email, origin, function(err) {
cb(err);
});
});
diff --git a/lib/load_gen/activities/signup.js b/lib/load_gen/activities/signup.js
index e628b3958..56e9adda7 100644
--- a/lib/load_gen/activities/signup.js
+++ b/lib/load_gen/activities/signup.js
@@ -38,7 +38,7 @@ const
wcli = require("../../wsapi_client.js"),
userdb = require("../user_db.js"),
winston = require('winston'),
-prepare = require('../prepare');
+common = require('../common');
/* this file is the "signup" activity, which simulates the process of a new user
* signing up for browserid. */
@@ -110,7 +110,7 @@ exports.startFunc = function(cfg, cb) {
}
// and now let's prepare this idenity in this context (get a keypair
// and certify it)
- prepare.authAndKey(cfg, user, context, email, function(err) {
+ common.authAndKey(cfg, user, context, email, function(err) {
cb(err);
});
});
diff --git a/lib/load_gen/prepare.js b/lib/load_gen/common.js
similarity index 100%
rename from lib/load_gen/prepare.js
rename to lib/load_gen/common.js
--
GitLab