diff --git a/login_provider/app.py b/login_provider/app.py index bf39b512ba3d1ae6a3568881a464a633c3822121..91a437bd5b58538d03717ebe6fef3684f89d52a3 100644 --- a/login_provider/app.py +++ b/login_provider/app.py @@ -40,7 +40,7 @@ def login(): login_form = LoginForm() if login_form.validate_on_submit(): user = User(login_form.username.data) - if user.active and user.verify_password(login_form.password.data): + if user.authenticate(login_form.password.data): login_user(user) next_url = login_form.next_url.data if not is_safe_url(next_url): diff --git a/login_provider/db.py b/login_provider/db.py index e9b5fa6d0ff14aebd66bff28158b148e0beabb0c..714e929e10e9dbf0b51ef8e6973797c071770b26 100644 --- a/login_provider/db.py +++ b/login_provider/db.py @@ -25,7 +25,7 @@ class User(UserMixin): self.active = result["data"]["getUser"]["active"] self.email = result["data"]["getUser"]["email"] - def verify_password(self, password): + def _verify_password(self, password): querystring = '''{{ verifyPassword( username: "{0}", @@ -37,3 +37,5 @@ class User(UserMixin): verified = result["data"]["verifyPassword"] return verified + def authenticate(self, password): + return self.active and self._verify_password(password)