Remove is_enabled method and use the enabled attribute instead

master
Stefan Auditor 7 years ago
parent 3b66fcada7
commit 733b89bff5

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

Loading…
Cancel
Save