Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion webservice/components/request_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ def _fetch_new_token(self, old_token):

def _request(self, method, url=None, url_params=None, **kwargs):
url = self._get_url(url=url, url_params=url_params)
content_only = kwargs.pop("content_only", True)
new_kwargs = kwargs.copy()
new_kwargs.update(
{
Expand All @@ -191,7 +192,9 @@ def _request(self, method, url=None, url_params=None, **kwargs):
# pylint: disable=E8106
request = session.request(method, url, **new_kwargs)
request.raise_for_status()
return request.content
if content_only:
return request.content
return request


class WebApplicationOAuth2RestRequestsAdapter(Component):
Expand Down
27 changes: 27 additions & 0 deletions webservice/tests/test_oauth2.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,33 @@ def test_update_token_with_error(self):
"old_token",
)

@responses.activate
def test_call_with_content_only_false_returns_response(self):
now = time.time()
duration = 3600
responses.add(
responses.POST,
f"{self.url}oauth2/token",
json={
"access_token": "cool_token",
"token_type": "Bearer",
"expires_in": duration,
"expires_at": now + duration,
},
)
responses.add(responses.POST, f"{self.url}endpoint", json={"ok": True})

with mock_cursor(self.env.cr):
response = self.webservice.call(
"post",
url=f"{self.url}endpoint",
data="payload",
content_only=False,
)

self.assertEqual(response.status_code, 200)
self.assertEqual(response.json(), {"ok": True})


class TestWebServiceOauth2WebApplication(CommonWebService):
@classmethod
Expand Down
Loading