Add email to users

3 files changed, 31 insertions, 3 deletions

diff --git a/server/models/author.js b/server/models/author.js
index f036193c8..34b013097 100644
--- a/server/models/author.js
+++ b/server/models/author.js
@@ -84,7 +84,9 @@ function findOrCreateAuthor (name, podId, userId, transaction, callback) {
   if (transaction) query.transaction = transaction
 
   this.findOrCreate(query).asCallback(function (err, result) {
+    if (err) return callback(err)
+
     // [ instance, wasCreated ]
-    return callback(err, result[0])
+    return callback(null, result[0])
   })
 }
diff --git a/server/models/pod.js b/server/models/pod.js
index 575ebbc61..79afb737a 100644
--- a/server/models/pod.js
+++ b/server/models/pod.js
@@ -35,7 +35,10 @@ module.exports = function (sequelize, DataTypes) {
       },
       email: {
         type: DataTypes.STRING(400),
-        allowNull: false
+        allowNull: false,
+        validate: {
+          isEmail: true
+        }
       }
     },
     {
diff --git a/server/models/user.js b/server/models/user.js
index 6cb9eec3f..35a98dd6b 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -32,6 +32,13 @@ module.exports = function (sequelize, DataTypes) {
           }
         }
       },
+      email: {
+        type: DataTypes.STRING,
+        allowNull: false,
+        validate: {
+          isEmail: true
+        }
+      },
       role: {
         type: DataTypes.ENUM(values(constants.USER_ROLES)),
         allowNull: false
@@ -42,6 +49,10 @@ module.exports = function (sequelize, DataTypes) {
         {
           fields: [ 'username' ],
           unique: true
+        },
+        {
+          fields: [ 'email' ],
+          unique: true
         }
       ],
       classMethods: {
@@ -52,7 +63,8 @@ module.exports = function (sequelize, DataTypes) {
         list,
         listForApi,
         loadById,
-        loadByUsername
+        loadByUsername,
+        loadByUsernameOrEmail
       },
       instanceMethods: {
         isPasswordMatch,
@@ -88,6 +100,7 @@ function toFormatedJSON () {
   return {
     id: this.id,
     username: this.username,
+    email: this.email,
     role: this.role,
     createdAt: this.createdAt
   }
@@ -151,3 +164,13 @@ function loadByUsername (username, callback) {
 
   return this.findOne(query).asCallback(callback)
 }
+
+function loadByUsernameOrEmail (username, email, callback) {
+  const query = {
+    where: {
+      $or: [ { username }, { email } ]
+    }
+  }
+
+  return this.findOne(query).asCallback(callback)
+}