Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2877 from matmair/matmair/issue2681

Browse Source 
API Mixin cleanup
This commit is contained in:
Oliver 2022-04-27 08:42:10 +10:00 committed by GitHub
commit 01ce571a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
InvenTree/plugin/builtin/integration/mixins.py
View File

@ -504,10 +504,10 @@ class APICallMixin:
@property @property
def api_headers(self): def api_headers(self):
return { headers = {'Content-Type': 'application/json'}
self.API_TOKEN: self.get_setting(self.API_TOKEN_SETTING), if getattr(self, 'API_TOKEN_SETTING'):
'Content-Type': 'application/json' headers[self.API_TOKEN] = self.get_setting(self.API_TOKEN_SETTING)
} return headers
def api_build_url_args(self, arguments): def api_build_url_args(self, arguments):
groups = [] groups = []
@ -515,16 +515,21 @@ class APICallMixin:
groups.append(f'{key}={",".join([str(a) for a in val])}') groups.append(f'{key}={",".join([str(a) for a in val])}')
return f'?{"&".join(groups)}' return f'?{"&".join(groups)}'
def api_call(self, endpoint, method: str = 'GET', url_args=None, data=None, headers=None, simple_response: bool = True): def api_call(self, endpoint, method: str = 'GET', url_args=None, data=None, headers=None, simple_response: bool = True, endpoint_is_url: bool = False):
if url_args: if url_args:
endpoint += self.api_build_url_args(url_args) endpoint += self.api_build_url_args(url_args)
if headers is None: if headers is None:
headers = self.api_headers headers = self.api_headers
if endpoint_is_url:
url = endpoint
else:
url = f'{self.api_url}/{endpoint}'
# build kwargs for call # build kwargs for call
kwargs = { kwargs = {
'url': f'{self.api_url}/{endpoint}', 'url': url,
'headers': headers, 'headers': headers,
} }
if data: if data: