forward the newsletter preference from the client and check for dupli…

…cate email
mozilla · Dec 13, 2012 · 1b7aa4c · 1b7aa4c
1 parent 7f926cd
commit 1b7aa4c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/client/client.js b/client/client.js
@@ -87,7 +87,7 @@ GombotClient.prototype = {
         password: args.pass
       }, function(err, r) {
         self.authKey = r.authKey;
-        args.data = JSON.stringify({email: args.email, pass: r.authKey});
+        args.data = JSON.stringify({email: args.email, pass: r.authKey, newsletter: args.newsletter});
         // send request with authKey as the password
         request(args, cb);
       });

diff --git a/lib/db/couchbase.js b/lib/db/couchbase.js
@@ -33,16 +33,19 @@ module.exports = {
     return this;
   },
   stageAccount: function(data, cb) {
-    var account = {
-      pass: data.pass,
-      email: data.email,
-      newsletter: !!data.newsletter,
-      staged: true
-    };
-    db.set(data.email, account, function (err, meta) {
-      console.log('meta', meta);
-      if (err) cb(err);
-      else cb(null, meta);
+    db.get(data.email, function (err, doc, meta) {
+      if (doc) return cb("That email has already been used");
+      var account = {
+        pass: data.pass,
+        email: data.email,
+        newsletter: !!data.newsletter,
+        staged: false
+      };
+      db.set(data.email, account, function (err, meta) {
+        console.log('meta', meta);
+        if (err) cb(err);
+        else cb(null, meta);
+      });
     });
     return this;
   },