Merge pull request #10 from squatconf/www-launch-rc2

v0.4.4-rc2 (latest fixes)

src/email-submit.js

@@ -19,42 +19,50 @@ module.exports = function(db) {
       var obj = {}
         , email  = sanitize(params.query.email)
 
-      console.log('got email:', params.query)
+      db.get(email, function(err, value) {
-
+        if ((err && err.type == 'NotFoundError') || ! value.verified) {
-      obj.token = rn()
+
-      obj.verified = false
+          console.log('got email:', params.query)
-      obj.events = { paris: params.query.paris ? true : false }
+
-      obj.trace = ip(req)
+          obj.token = rn()
-
+          obj.verified = false
-      db.put(email, obj, function(err) {
+          obj.events = { paris: params.query.paris ? true : false }
-        if (err) return error(err)
+          obj.trace = ip(req)
-
+
-        // db write OK..
+          db.put(email, obj, function(err) {
-        var nodemailer  = require('nodemailer')
+            if (err) return error(err)
-          , transporter = nodemailer.createTransport()
+
-          , url  = config.host +'/confirm'
+            // db write OK..
-          , qstr = '?email='+ email +'&token='+ obj.token
+            var nodemailer  = require('nodemailer')
-          , link = url + qstr +'\n\n'
+              , transporter = nodemailer.createTransport()
-
+              , url  = config.host +'/confirm'
-        var opts = {
+              , qstr = '?email='+ email +'&token='+ obj.token
-            from   : config.email.from
+              , link = url + qstr +'\n\n'
-          , to     : email
-          , subject: config.email.subject
-        //, link   : link
-          , text   : config.email.bodyText.replace(/\%link\%/, link)
-        }
 
-        transporter.sendMail(opts, function(err, data) {
+            var opts = {
-          if (err) return error(err)
+                from   : config.email.from
+              , to     : email
+              , subject: config.email.subject
+              , text   : config.email.bodyText.replace(/\%link\%/, link)
+            }
 
-          // validation email sent
+            transporter.sendMail(opts, function(err, data) {
-          console.log('email sent..', opts)
+              if (err) return error(err)
+
+              // validation email sent
+              console.log('email sent..', opts)
+
+              res.statusCode = 302
+              res.setHeader('Location', '/')
+              return res.end()
+            })
+          })
+
+        } else {
+          error('already verified: '+ email)
+        }
+      }
 
-          res.statusCode = 302
-          res.setHeader('Location', '/')
-          return res.end()
-        })
-      })
     } else {
       error('invalid input: '+ JSON.stringify(params.query))
     }