From 7b9f490b8905888a3fd3eba8d6362c6f9176712d Mon Sep 17 00:00:00 2001 From: hongwei1 Date: Sat, 10 Aug 2019 23:42:18 +0200 Subject: [PATCH] add comments for gatewaylogin --- apimanager/obp/forms.py | 2 +- apimanager/obp/gatewaylogin.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apimanager/obp/forms.py b/apimanager/obp/forms.py index 2299b8f..24ad01f 100644 --- a/apimanager/obp/forms.py +++ b/apimanager/obp/forms.py @@ -45,7 +45,7 @@ class GatewayLoginForm(forms.Form): cleaned_data = super(GatewayLoginForm, self).clean() authenticator = GatewayLoginAuthenticator() try: - authenticator.login_to_api(cleaned_data) + authenticator.prepare_gateway_login_token(cleaned_data) cleaned_data['authenticator'] = authenticator except AuthenticatorError as err: raise forms.ValidationError(err) diff --git a/apimanager/obp/gatewaylogin.py b/apimanager/obp/gatewaylogin.py index 94218de..ee238eb 100644 --- a/apimanager/obp/gatewaylogin.py +++ b/apimanager/obp/gatewaylogin.py @@ -45,7 +45,7 @@ class GatewayLoginAuthenticator(Authenticator): self.token = token.decode('utf-8') return self.token - def login_to_api(self, data): + def prepare_gateway_login_token(self, data): token = self.create_jwt(data) # Make a test call to see if the token works url = '{}{}'.format(settings.API_ROOT, '/users/current') @@ -53,9 +53,14 @@ class GatewayLoginAuthenticator(Authenticator): try: response = api.get(url) except requests.exceptions.ConnectionError as err: - raise AuthenticatorError(err) + raise AuthenticatorError(Exception("OBP-API server is not running or do not response properly. " + "Please check OBP-API server. " + "Details: " + str(err))) + except BaseException as err: + raise AuthenticatorError(Exception("Unknown Error. Details:" + str(err))) + # this will show the obp errors if response.status_code != 200: - raise AuthenticatorError(response.json()['error']) + raise AuthenticatorError(response.json()['message']) else: return token