From b70f763c5c0acad5a92f4ddafb5f60b2915b5fda Mon Sep 17 00:00:00 2001 From: Gareth Simons Date: Thu, 13 Jan 2022 22:54:19 +0000 Subject: [PATCH 1/3] Fixes string formatting (vs. javascript style) --- gotrue/_async/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gotrue/_async/api.py b/gotrue/_async/api.py index 91225f53..e99dcb92 100644 --- a/gotrue/_async/api.py +++ b/gotrue/_async/api.py @@ -553,7 +553,7 @@ async def delete_user(self, *, uid: str, jwt: str) -> User: If an error occurs """ headers = self._create_request_headers(jwt=jwt) - url = f"{self.url}/admin/users/${uid}" + url = f"{self.url}/admin/users/{uid}" response = await self.http_client.delete(url, headers=headers) return User.parse_response(response) From 630cacb35e134d4e8a99ccd4b640599c31e0e09e Mon Sep 17 00:00:00 2001 From: Gareth Simons Date: Thu, 13 Jan 2022 22:54:51 +0000 Subject: [PATCH 2/3] Fixes string formatting (vs. javascript style) --- gotrue/_sync/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gotrue/_sync/api.py b/gotrue/_sync/api.py index 6af8ce41..c5f930b4 100644 --- a/gotrue/_sync/api.py +++ b/gotrue/_sync/api.py @@ -553,7 +553,7 @@ def delete_user(self, *, uid: str, jwt: str) -> User: If an error occurs """ headers = self._create_request_headers(jwt=jwt) - url = f"{self.url}/admin/users/${uid}" + url = f"{self.url}/admin/users/{uid}" response = self.http_client.delete(url, headers=headers) return User.parse_response(response) From 5cc4f0961463d41ba62111b0040ae4bfbd3ca34a Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Thu, 13 Jan 2022 22:56:35 +0000 Subject: [PATCH 3/3] 'Refactored by Sourcery' --- gotrue/_async/api.py | 12 +++++------- gotrue/_sync/api.py | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/gotrue/_async/api.py b/gotrue/_async/api.py index e99dcb92..671a3745 100644 --- a/gotrue/_async/api.py +++ b/gotrue/_async/api.py @@ -31,7 +31,7 @@ def __init__( self.url = url self.headers = headers self.cookie_options = cookie_options - self.http_client = http_client if http_client else AsyncClient() + self.http_client = http_client or AsyncClient() async def __aenter__(self) -> AsyncGoTrueAPI: return self @@ -238,10 +238,9 @@ async def sign_in_with_phone( error : APIError If an error occurs """ - headers = self.headers - query_string = "?grant_type=password" data = {"phone": phone, "password": password} - url = f"{self.url}/token{query_string}" + url = f'{self.url}/token?grant_type=password' + headers = self.headers response = await self.http_client.post(url, json=data, headers=headers) return Session.parse_response(response) @@ -575,10 +574,9 @@ async def refresh_access_token(self, *, refresh_token: str) -> Session: error : APIError If an error occurs """ - headers = self.headers - query_string = "?grant_type=refresh_token" data = {"refresh_token": refresh_token} - url = f"{self.url}/token{query_string}" + url = f'{self.url}/token?grant_type=refresh_token' + headers = self.headers response = await self.http_client.post(url, json=data, headers=headers) return Session.parse_response(response) diff --git a/gotrue/_sync/api.py b/gotrue/_sync/api.py index c5f930b4..f72329fa 100644 --- a/gotrue/_sync/api.py +++ b/gotrue/_sync/api.py @@ -31,7 +31,7 @@ def __init__( self.url = url self.headers = headers self.cookie_options = cookie_options - self.http_client = http_client if http_client else SyncClient() + self.http_client = http_client or SyncClient() def __enter__(self) -> SyncGoTrueAPI: return self @@ -238,10 +238,9 @@ def sign_in_with_phone( error : APIError If an error occurs """ - headers = self.headers - query_string = "?grant_type=password" data = {"phone": phone, "password": password} - url = f"{self.url}/token{query_string}" + url = f'{self.url}/token?grant_type=password' + headers = self.headers response = self.http_client.post(url, json=data, headers=headers) return Session.parse_response(response) @@ -575,10 +574,9 @@ def refresh_access_token(self, *, refresh_token: str) -> Session: error : APIError If an error occurs """ - headers = self.headers - query_string = "?grant_type=refresh_token" data = {"refresh_token": refresh_token} - url = f"{self.url}/token{query_string}" + url = f'{self.url}/token?grant_type=refresh_token' + headers = self.headers response = self.http_client.post(url, json=data, headers=headers) return Session.parse_response(response)