diff --git a/lib/load_gen/activities/add_email.js b/lib/load_gen/activities/add_email.js index aa12ba00d45ce82202512b4d8d63840d0b484829..6ec6a4bd87bbcf073f3f0c2687a9091527c91e12 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 e75613f13335d1112e35d0538ad3781804fc92bd..72be75773b0eff8a9c86fbe4b494514a9bbc864b 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 e628b39581682ffa7f2fce56967486934f469e79..56e9adda7e2ad7dfa9e00fc54127adefe09a7422 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