Unverified Commit 05aa4c28 authored by Dannon's avatar Dannon Committed by GitHub
Browse files

Merge pull request #10401 from nsoranzo/release_20.01_retry_also_when_email_is_lowercase 

[20.01] Try case-insensitive match on email also when it's lowercase
parents 53b60032 150ab0d6

lib/galaxy/webapps/galaxy/controllers/user.py

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ class User(BaseUIController, UsesFormDefinitionsMixin, CreatesApiKeysMixin): 
            trans.app.model.User.table.c.email == login,

            trans.app.model.User.table.c.username == login

        )).first()

        if not user and login.lower() != login:

        if not user:

            # Try a case-insensitive match on the email

            user = trans.sa_session.query(trans.app.model.User).filter(

                func.lower(trans.app.model.User.table.c.email) == login.lower()

            ).first()