self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-02-15 13:33:21 +02:00
Code Issues Releases Activity

Remove is_enabled method and use the enabled attribute instead

Browse Source
This commit is contained in:
Stefan Auditor 2018-04-15 13:42:08 +02:00
parent 3b66fcada7
commit 733b89bff5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/admin/mailu/models.py
View File

@ -221,9 +221,6 @@ class User(Base, Email):
default=scheme_dict[app.config['PASSWORD_SCHEME']],
)
def is_enabled(self):
return self.enabled
def check_password(self, password):
reference = re.match('({[^}]+})?(.*)', self.password).group(2)
return User.pw_context.verify(password, reference)
@ -260,7 +257,7 @@ class User(Base, Email):
@classmethod
def login(cls, email, password):
user = cls.query.get(email)
return user if (user and user.check_password(password) and user.is_enabled()) else None
return user if (user and user.enabled and user.check_password(password)) else None
login_manager.user_loader(User.query.get)