Use lower instead of ilike to login users

pull/2396/head
Chocobozzz 2020-01-09 14:00:34 +01:00
parent 41ee83423c
commit c4a1811ea8
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 7 additions and 3 deletions

View File

@ -169,7 +169,7 @@ function getZanataContributors () {
function getContributorsBlacklist () {
return {
'Florian Bigard': true,
'Bigard Florian': true,
'chocobozzz': true,
'Rigel': true
}

View File

@ -1,4 +1,4 @@
import { FindOptions, literal, Op, QueryTypes } from 'sequelize'
import { FindOptions, literal, Op, QueryTypes, where, fn, col } from 'sequelize'
import {
AfterDestroy,
AfterUpdate,
@ -465,7 +465,11 @@ export class UserModel extends Model<UserModel> {
const query = {
where: {
[ Op.or ]: [ { username: { [ Op.iLike ]: username } }, { email } ]
[ Op.or ]: [
where(fn('lower', col('username')), fn('lower', username)),
{ email }
]
}
}