From c9cf962de24b2d17250031e65e01e58205351c4e Mon Sep 17 00:00:00 2001 From: Mark <mark@openappstack.net> Date: Fri, 25 Oct 2019 15:43:09 +0200 Subject: [PATCH] Refactor grapqhl calls to use variable function --- login_provider/db.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/login_provider/db.py b/login_provider/db.py index 714e929..cc896d9 100644 --- a/login_provider/db.py +++ b/login_provider/db.py @@ -15,23 +15,28 @@ class User(UserMixin): self._load_remote_user_info() def _load_remote_user_info(self): - querystring = '''{{ - getUser(username: "{0}"){{ + querystring = '''{ + getUser(username: $username){ email, active - }}}}'''.format(self.username).strip() - result = loads(graphql_client.execute(querystring)) + }}''' + result = loads(graphql_client.execute(querystring, {'username': self.username})) if "data" in result: self.active = result["data"]["getUser"]["active"] self.email = result["data"]["getUser"]["email"] def _verify_password(self, password): - querystring = '''{{ + querystring = '''{ verifyPassword( - username: "{0}", - password: "{1}") - }}'''.format(self.username, password).strip() - result = loads(graphql_client.execute(querystring)) + username: $username, + password: $password) + }}''' + result = loads( + graphql_client.execute(querystring, { + 'username': self.username, + 'password': password + }) + ) verified = False if "data" in result: verified = result["data"]["verifyPassword"] -- GitLab