Skip to content
This repository has been archived by the owner on Nov 1, 2018. It is now read-only.

Commit

Permalink
[~] Исправление проблемы, которая приводиле к невозможности использов…
Browse files Browse the repository at this point in the history
…ания ExternalSystemService если token_info is None
  • Loading branch information
arturgspb committed Jul 12, 2018
1 parent 6757d8a commit b26b458
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion metaappscriptsdk/info.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '0.6.13'
__version__ = '0.6.14'
__package_name__ = 'metaappscriptsdk'

if __name__ == "__main__":
Expand Down
23 changes: 14 additions & 9 deletions metaappscriptsdk/services/ExternalSystemService.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from ..utils import decode_jwt



class ExternalSystemService:
def __init__(self, app, default_headers):
"""
Expand All @@ -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

0 comments on commit b26b458

Please sign in to comment.