From b26b4584274d9e1a6def0b2a9357fef119caeebc Mon Sep 17 00:00:00 2001 From: arturgspb Date: Thu, 12 Jul 2018 15:58:59 +0300 Subject: [PATCH] =?UTF-8?q?[~]=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB?= =?UTF-8?q?=D0=B5=D0=BC=D1=8B,=20=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=B8=D0=B2=D0=BE=D0=B4=D0=B8=D0=BB=D0=B5?= =?UTF-8?q?=20=D0=BA=20=D0=BD=D0=B5=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20ExternalSyst?= =?UTF-8?q?emService=20=D0=B5=D1=81=D0=BB=D0=B8=20token=5Finfo=20is=20None?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- metaappscriptsdk/info.py | 2 +- .../services/ExternalSystemService.py | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/metaappscriptsdk/info.py b/metaappscriptsdk/info.py index 17e1514..dda4384 100644 --- a/metaappscriptsdk/info.py +++ b/metaappscriptsdk/info.py @@ -1,4 +1,4 @@ -__version__ = '0.6.13' +__version__ = '0.6.14' __package_name__ = 'metaappscriptsdk' if __name__ == "__main__": diff --git a/metaappscriptsdk/services/ExternalSystemService.py b/metaappscriptsdk/services/ExternalSystemService.py index 159239d..b1df40e 100644 --- a/metaappscriptsdk/services/ExternalSystemService.py +++ b/metaappscriptsdk/services/ExternalSystemService.py @@ -1,7 +1,6 @@ from ..utils import decode_jwt - class ExternalSystemService: def __init__(self, app, default_headers): """ @@ -18,17 +17,23 @@ def __init__(self, app, default_headers): def get_access(self, ex_access_id): ex_access = self.__metadb.one( """ - SELECT token_info - , form_data - FROM meta.ex_access - WHERE id=:id::uuid + SELECT + ex_system_id, + login, + token_info, + form_data + FROM meta.ex_access + WHERE id=:id::uuid """, {"id": ex_access_id} ) - ex_access['token_info']['accessToken'] = \ - decode_jwt(ex_access.get('token_info', {}).get('accessToken'), self.__crypt_params['secureKey']) - ex_access['token_info']['refreshToken'] = \ - decode_jwt(ex_access.get('token_info', {}).get('refreshToken'), self.__crypt_params['secureKey']) + token_info_ = ex_access.get('token_info') + + if token_info_ and token_info_.get('accessToken'): + ex_access['token_info']['accessToken'] = decode_jwt(token_info_.get('accessToken'), self.__crypt_params['secureKey']) + + if token_info_ and token_info_.get('refreshToken'): + ex_access['token_info']['refreshToken'] = decode_jwt(token_info_.get('refreshToken'), self.__crypt_params['secureKey']) return ex_access