fix: force lowercase for email on local auth

requarks · Sep 9, 2020 · aa96e97 · aa96e97
1 parent 5295e41
commit aa96e97
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/server/db/migrations-sqlite/2.5.128.js b/server/db/migrations-sqlite/2.5.128.js
@@ -0,0 +1,7 @@
+exports.up = async knex => {
+  await knex('users').update({
+    email: knex.raw('LOWER(email)')
+  })
+}
+
+exports.down = knex => { }
diff --git a/server/db/migrations/2.5.128.js b/server/db/migrations/2.5.128.js
@@ -0,0 +1,7 @@
+exports.up = async knex => {
+  await knex('users').update({
+    email: knex.raw('LOWER(??)', ['email'])
+  })
+}
+
+exports.down = knex => { }
diff --git a/server/models/users.js b/server/models/users.js
@@ -675,7 +675,7 @@ module.exports = class User extends Model {
         if (dupUsr) {
           throw new WIKI.Error.AuthAccountAlreadyExists()
         }
-        usrData.email = email
+        usrData.email = _.toLower(email)
       }
       if (!_.isEmpty(name) && name !== usr.name) {
         usrData.name = _.trim(name)

diff --git a/server/modules/authentication/local/authentication.js b/server/modules/authentication/local/authentication.js
@@ -15,7 +15,7 @@ module.exports = {
       }, async (uEmail, uPassword, done) => {
         try {
           const user = await WIKI.models.users.query().findOne({
-            email: uEmail,
+            email: uEmail.toLowerCase(),
             providerKey: 'local'
           })
           if (user) {