Commit 2579e811 authored by Jonathan Laperle's avatar Jonathan Laperle
Browse files

combine user exist check with user deleted check

parent beb70542

lib/galaxy/managers/users.py

+1 −3
Original line number Diff line number Diff line
@@ -613,11 +613,9 @@ class UserManager(base.ModelManager, deletable.PurgableManagerMixin): 


    def get_reset_token(self, trans, email):

        reset_user = get_user_by_email(trans.sa_session, email, self.app.model.User)

        if reset_user and reset_user.deleted:

            return None, None

        if not reset_user and email != email.lower():

            reset_user = self._get_user_by_email_case_insensitive(trans.sa_session, email)

        if reset_user:

        if reset_user and not reset_user.deleted:

            prt = self.app.model.PasswordResetToken(reset_user)

            trans.sa_session.add(prt)

            with transaction(trans.sa_session):