From 9a4dd16abbee4cc90285adaffc657eba4daa8e65 Mon Sep 17 00:00:00 2001 From: Evan Sims Date: Thu, 16 Jan 2025 00:04:53 -0600 Subject: [PATCH] updates --- openfga_sdk/oauth2.py | 11 ++- openfga_sdk/rest.py | 137 ------------------------------------- openfga_sdk/sync/oauth2.py | 11 ++- openfga_sdk/sync/rest.py | 137 ------------------------------------- test/oauth2_test.py | 4 +- test/sync/oauth2_test.py | 4 +- 6 files changed, 22 insertions(+), 282 deletions(-) diff --git a/openfga_sdk/oauth2.py b/openfga_sdk/oauth2.py index 6b458823..5f46c76d 100644 --- a/openfga_sdk/oauth2.py +++ b/openfga_sdk/oauth2.py @@ -106,8 +106,15 @@ async def _obtain_token(self, client): ) for attempt in range(max_retry + 1): - raw_response = await client.POST( - token_url, headers=headers, post_params=post_params + raw_response = await client.request( + method="POST", + url=token_url, + headers=headers, + query_params=None, + body=None, + _preload_content=True, + _request_timeout=None, + post_params=post_params, ) if 500 <= raw_response.status <= 599 or raw_response.status == 429: diff --git a/openfga_sdk/rest.py b/openfga_sdk/rest.py index 24e920e6..96df546f 100644 --- a/openfga_sdk/rest.py +++ b/openfga_sdk/rest.py @@ -269,140 +269,3 @@ async def request( await self.handle_response_exception(response) return response - - async def GET( - self, - url, - headers=None, - query_params=None, - _preload_content=True, - _request_timeout=None, - ): - return await self.request( - "GET", - url, - headers=headers, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - query_params=query_params, - ) - - async def HEAD( - self, - url, - headers=None, - query_params=None, - _preload_content=True, - _request_timeout=None, - ): - return await self.request( - "HEAD", - url, - headers=headers, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - query_params=query_params, - ) - - async def OPTIONS( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return await self.request( - "OPTIONS", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - async def DELETE( - self, - url, - headers=None, - query_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return await self.request( - "DELETE", - url, - headers=headers, - query_params=query_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - async def POST( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return await self.request( - "POST", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - async def PUT( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return await self.request( - "PUT", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - async def PATCH( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return await self.request( - "PATCH", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) diff --git a/openfga_sdk/sync/oauth2.py b/openfga_sdk/sync/oauth2.py index b6f73e95..a666b052 100644 --- a/openfga_sdk/sync/oauth2.py +++ b/openfga_sdk/sync/oauth2.py @@ -106,8 +106,15 @@ def _obtain_token(self, client): ) for attempt in range(max_retry + 1): - raw_response = client.POST( - token_url, headers=headers, post_params=post_params + raw_response = client.request( + method="POST", + url=token_url, + headers=headers, + query_params=None, + body=None, + _preload_content=True, + _request_timeout=None, + post_params=post_params, ) if 500 <= raw_response.status <= 599 or raw_response.status == 429: diff --git a/openfga_sdk/sync/rest.py b/openfga_sdk/sync/rest.py index 290c181b..fd98df60 100644 --- a/openfga_sdk/sync/rest.py +++ b/openfga_sdk/sync/rest.py @@ -307,140 +307,3 @@ def request( self.close() return response - - def GET( - self, - url, - headers=None, - query_params=None, - _preload_content=True, - _request_timeout=None, - ): - return self.request( - "GET", - url, - headers=headers, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - query_params=query_params, - ) - - def HEAD( - self, - url, - headers=None, - query_params=None, - _preload_content=True, - _request_timeout=None, - ): - return self.request( - "HEAD", - url, - headers=headers, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - query_params=query_params, - ) - - def OPTIONS( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return self.request( - "OPTIONS", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - def DELETE( - self, - url, - headers=None, - query_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return self.request( - "DELETE", - url, - headers=headers, - query_params=query_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - def POST( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return self.request( - "POST", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - def PUT( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return self.request( - "PUT", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) - - def PATCH( - self, - url, - headers=None, - query_params=None, - post_params=None, - body=None, - _preload_content=True, - _request_timeout=None, - ): - return self.request( - "PATCH", - url, - headers=headers, - query_params=query_params, - post_params=post_params, - _preload_content=_preload_content, - _request_timeout=_request_timeout, - body=body, - ) diff --git a/test/oauth2_test.py b/test/oauth2_test.py index 77e902a9..7f50ce3c 100644 --- a/test/oauth2_test.py +++ b/test/oauth2_test.py @@ -88,8 +88,8 @@ async def test_get_authentication_obtain_client_credentials(self, mock_request): } ) mock_request.assert_called_once_with( - "POST", - "https://issuer.fga.example/oauth/token", + method="POST", + url="https://issuer.fga.example/oauth/token", headers=expected_header, query_params=None, body=None, diff --git a/test/sync/oauth2_test.py b/test/sync/oauth2_test.py index f84ae26d..f5d81f0f 100644 --- a/test/sync/oauth2_test.py +++ b/test/sync/oauth2_test.py @@ -88,8 +88,8 @@ def test_get_authentication_obtain_client_credentials(self, mock_request): } ) mock_request.assert_called_once_with( - "POST", - "https://issuer.fga.example/oauth/token", + method="POST", + url="https://issuer.fga.example/oauth/token", headers=expected_header, query_params=None, body=None,