Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@evansims
evansims committed Jan 16, 2025
1 parent fdcf95a commit 9a4dd16
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 282 deletions.
11 changes: 9 additions & 2 deletions openfga_sdk/oauth2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
137 changes: 0 additions & 137 deletions openfga_sdk/rest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
11 changes: 9 additions & 2 deletions openfga_sdk/sync/oauth2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
137 changes: 0 additions & 137 deletions openfga_sdk/sync/rest.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
4 changes: 2 additions & 2 deletions test/oauth2_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions test/sync/oauth2_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9a4dd16

Please sign in to comment.