From 790d65cb9c0c01a1acdcdfbe7b2df06867dcd8c7 Mon Sep 17 00:00:00 2001
From: Lloyd Hilaiel <lloyd@hilaiel.com>
Date: Fri, 5 Aug 2011 11:59:44 -0600
Subject: [PATCH] (mysql driver) implement stageEmail
---
browserid/lib/db_mysql.js | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/browserid/lib/db_mysql.js b/browserid/lib/db_mysql.js
index 0b8be39ec..0a5aafa78 100644
--- a/browserid/lib/db_mysql.js
+++ b/browserid/lib/db_mysql.js
@@ -161,8 +161,10 @@ exports.stageUser = function(obj, cb) {
'ON DUPLICATE KEY UPDATE secret=?, existing="", new_acct=TRUE, pubkey=?, passwd=?',
[ secret, obj.email, obj.pubkey, obj.hash, secret, obj.pubkey, obj.hash],
function(err) {
- if (err) cb(undefined, err);
- else cb(secret);
+ if (err) {
+ logUnexpectedError(err);
+ cb(undefined, err);
+ } else cb(secret);
});
}
@@ -259,8 +261,19 @@ exports.addKeyToEmail = function(existing_email, email, pubkey, cb) {
});
}
-exports.stageEmail = function() {
- throw "not implemented";
+exports.stageEmail = function(existing_email, new_email, pubkey, cb) {
+ var secret = secrets.generate(48);
+ // overwrite previously staged users
+ client.query('INSERT INTO staged (secret, new_acct, existing, email, pubkey) VALUES(?,FALSE,?,?,?) ' +
+ 'ON DUPLICATE KEY UPDATE secret=?, existing=?, new_acct=FALSE, pubkey=?, passwd=""',
+ [ secret, existing_email, new_email, pubkey, secret, existing_email, pubkey],
+ function(err) {
+ if (err) {
+ logUnexpectedError(err);
+ cb(undefined, err);
+ }
+ else cb(secret);
+ });
}
exports.checkAuth = function(email, cb) {
--
GitLab