From 0175ad1281cc84e4845729e41d66abe812fb6274 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Wed, 21 Dec 2011 12:20:13 -0700
Subject: [PATCH] move 'primary.js' - abstraction for interacting with
primaries - down to lib/, now it's used by different processes
---
lib/{browserid => }/primary.js | 2 +-
lib/wsapi/address_info.js | 2 +-
lib/wsapi/auth_with_assertion.js | 2 +-
lib/wsapi/create_account_with_assertion.js | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
rename lib/{browserid => }/primary.js (99%)
diff --git a/lib/browserid/primary.js b/lib/primary.js
similarity index 99%
rename from lib/browserid/primary.js
rename to lib/primary.js
index f9596c223..c76a80af9 100644
--- a/lib/browserid/primary.js
+++ b/lib/primary.js
@@ -40,7 +40,7 @@
const
https = require('https'),
-logger = require('../logging.js').logger,
+logger = require('./logging.js').logger,
urlparse = require('urlparse'),
jwk = require('jwcrypto/jwk'),
jwcert = require("jwcrypto/jwcert"),
diff --git a/lib/wsapi/address_info.js b/lib/wsapi/address_info.js
index b7cae9963..15c7f0e6a 100644
--- a/lib/wsapi/address_info.js
+++ b/lib/wsapi/address_info.js
@@ -1,6 +1,6 @@
const
db = require('../db.js'),
-primary = require('../browserid/primary.js');
+primary = require('../primary.js');
// return information about an email address.
// type: is this an address with 'primary' or 'secondary' support?
diff --git a/lib/wsapi/auth_with_assertion.js b/lib/wsapi/auth_with_assertion.js
index 90729e65a..be6661172 100644
--- a/lib/wsapi/auth_with_assertion.js
+++ b/lib/wsapi/auth_with_assertion.js
@@ -4,7 +4,7 @@ wsapi = require('../wsapi.js'),
httputils = require('../httputils'),
logger = require('../logging.js').logger,
querystring = require('querystring'),
-primary = require('../browserid/primary.js'),
+primary = require('../primary.js'),
http = require('http'),
https = require('https');
diff --git a/lib/wsapi/create_account_with_assertion.js b/lib/wsapi/create_account_with_assertion.js
index 90c2d7c2b..82c9f431e 100644
--- a/lib/wsapi/create_account_with_assertion.js
+++ b/lib/wsapi/create_account_with_assertion.js
@@ -2,7 +2,7 @@ const
db = require('../db.js'),
wsapi = require('../wsapi.js'),
httputils = require('../httputils'),
-primary = require('../browserid/primary.js'),
+primary = require('../primary.js'),
logger = require('../logging.js').logger;
exports.method = 'post';
--
GitLab