Merge pull request #85 from braydonf/email-validation

Relax email validation to only care about lengths

lib/models/debit.js

@@ -21,6 +21,10 @@ const Debit = new mongoose.Schema({
     type: String,
     required: true,
     ref: 'User',
+    validate: {
+      validator: value => utils.isValidEmail(value),
+      message: 'Invalid user email address'
+    }
   },
   created: {
     type: Date,

lib/models/payment-processor.js

@@ -38,7 +38,11 @@ const PaymentProcessorSchema = new mongoose.Schema({
   user: {
     type: String,
     ref: 'User',
-    required: true
+    required: true,
+    validate: {
+      validator: value => utils.isValidEmail(value),
+      message: 'Invalid user email address'
+    }
   },
   name: {
     type: String,

lib/models/pubkey.js

@@ -18,7 +18,13 @@ var PublicKey = new mongoose.Schema({
   },
   user: {
     type: String,
-    ref: 'User'
+    ref: 'User',
+    validate: {
+      validator: function(v) {
+        return utils.isValidEmail(v);
+      },
+      message: 'Invalid user email address'
+    },
   },
   label: {
     type: String

lib/models/storage-event.js

@@ -22,7 +22,11 @@ var StorageEvent = new mongoose.Schema({
   user: {
     type: String, 
     ref: 'User',
-    required: true
+    required: true,
+    validate: {
+      validator: value => utils.isValidEmail(value),
+      message: 'Invalid user email address'
+    }
   },
   timestamp: {
     type: Date,

lib/models/user.js

@@ -15,7 +15,11 @@ const { isValidEmail } = require('../utils');
 var UserSchema = new mongoose.Schema({
   _id: {
     type: String,
-    required: true
+    required: true,
+    validate: {
+      validator: value => isValidEmail(value),
+      message: 'Invalid user email address'
+    }
   },
   hashpass: {
     type: String,

lib/models/usernonce.js

@@ -12,7 +12,11 @@ var UserNonce = new mongoose.Schema({
   user: {
     type: String,
     ref: 'User',
-    required: true
+    required: true,
+    validate: {
+      validator: value => utils.isValidEmail(value),
+      message: 'Invalid user email address'
+    }
   },
   nonce: {
     type: String,

lib/utils.js

@@ -3,12 +3,7 @@
 const moment = require('moment');
 
 module.exports.isValidEmail = function (email) {
-  const tester = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@(([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})|(([a-zA-Z\-0-9]+)(\.[a-zA-Z\-0-9]+){1,}))$/; // jshint ignore:line
-
-  if (email.length > 254) {
-    return false;
-  }
-
+  const tester = /^.{1,64}@.{1,255}$/;
   if (!tester.test(email)) {
     return false;
   }

test/contact.unit.js

@@ -50,7 +50,9 @@ describe('Storage/models/Contact', function() {
           lastSeen: Date.now()
         }, next);
       }, function(err) {
-        expect(err).to.not.be.instanceOf(Error);
+        if (err) {
+          return done(err);
+        }
         Contact.count({}, function(err, count) {
           expect(count).to.equal(3);
           done();

test/data/email.json

@@ -11,11 +11,7 @@
   "invalid": [
     "me@",
     "@example.com",
-    "me.@example.com",
-    ".me@example.com",
-    "me@example..com",
-    "me.example@com",
-    "me\\@example.com",
-    "wrong@domain"
+    "c4e34e270ebbe228b2543b6bd2c148e582659ccbad061ab9dc67518e6f0275f700@domain.com",
+    "user@614c22107dbc2ad8bee0e7b4bec8818ff52181be56233009903d8a4a1e74a80cd1fcf34707132c25a7cda0fc70ab572ca1d39b6935e254ddcfa2b2efe58cbf371bd3ef610dfc6822b03420a922358ab3fc7b120f48289c341fbd9a30137f5b05db8ad95d7ce8758346ebb6589f6f6a20ecc204c0d219eac61c9bc43b499eae11"
   ]
 }

test/debit.unit.js

@@ -35,7 +35,7 @@ describe('Storage/models/Debit', function() {
   describe('@constructor', function() {
     it('should fail validation', function(done) {
       const debit = new Debit({
-        user: 'nobody@nowhere',
+        user: 'nobody@',
         amount: 10000,
         type: DEBIT_TYPES.STORAGE
       });

test/frame.unit.js

@@ -43,7 +43,7 @@ describe('Storage/models/Frame', function() {
   describe('@constructor', function() {
     it('should fail validation', function(done) {
       const frame = new Frame({
-        user: 'nobody@nowhere'
+        user: 'nobody@'
       });
       frame.save((err) => {
         expect(err).to.be.instanceOf(Error);

test/payment-processor.unit.js

@@ -29,7 +29,7 @@ describe('Storage/models/PaymentProcessor', function() {
   describe('@constructor', function() {
     it('should fail validation', function(done) {
       const pp = new PaymentProcessor({
-        user: 'nobody@nowhere',
+        user: 'nobody@',
         name: 'stripe'
       });
       pp.save((err) => {

test/user.unit.js

@@ -56,8 +56,8 @@ describe('Storage/models/User', function() {
       });
     });
 
-    it('should not create a invalid email (no tld)', function(done) {
-      User.create('wrong@domain', sha256('password'), function(err) {
+    it('should not create a invalid email (no domain)', function(done) {
+      User.create('wrong@', sha256('password'), function(err) {
         expect(err).to.be.instanceOf(Error);
         expect(err.message).to.equal('Invalid email');
         done();
@@ -106,9 +106,9 @@ describe('Storage/models/User', function() {
         });
     });
 
-    it('should not create email with invalid symbols', function(done) {
+    it('should not create email with no user', function(done) {
       User.create(
-        'test()test@gmail.com',
+        '@gmail.com',
         sha256('password'),
         function(err) {
           expect(err).to.be.instanceOf(Error);

test/usernonce.unit.js

@@ -51,7 +51,7 @@ describe('Storage/models/UserNonce', function() {
   describe('@constructor', function() {
     it('should fail validation', function(done) {
       const nonce = new UserNonce({
-        user: 'nobody@nowhere',
+        user: 'nobody@',
         nonce: n
       });
       nonce.save((err) => {