fix: delete_user returns Exception event if response is Ok (#68)

* fix: delete_user returns Exception event if response is Ok

* 'Refactored by Sourcery' (#69)

Co-authored-by: Sourcery AI <>

* chore: format code

Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>

Author: leynier

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)
 
@@ -529,7 +528,7 @@ async def update_user(
         response = await self.http_client.put(url, json=data, headers=headers)
         return User.parse_response(response)
 
-    async def delete_user(self, *, uid: str, jwt: str) -> User:
+    async def delete_user(self, *, uid: str, jwt: str) -> None:
         """Delete a user. Requires a `service_role` key.
 
         This function should only be called on a server.
@@ -555,7 +554,7 @@ async def delete_user(self, *, uid: str, jwt: str) -> User:
         headers = self._create_request_headers(jwt=jwt)
         url = f"{self.url}/admin/users/{uid}"
         response = await self.http_client.delete(url, headers=headers)
-        return User.parse_response(response)
+        return check_response(response)
 
     async def refresh_access_token(self, *, refresh_token: str) -> Session:
         """Generates a new JWT.
@@ -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)
 

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)
 
@@ -529,7 +528,7 @@ def update_user(
         response = self.http_client.put(url, json=data, headers=headers)
         return User.parse_response(response)
 
-    def delete_user(self, *, uid: str, jwt: str) -> User:
+    def delete_user(self, *, uid: str, jwt: str) -> None:
         """Delete a user. Requires a `service_role` key.
 
         This function should only be called on a server.
@@ -555,7 +554,7 @@ def delete_user(self, *, uid: str, jwt: str) -> User:
         headers = self._create_request_headers(jwt=jwt)
         url = f"{self.url}/admin/users/{uid}"
         response = self.http_client.delete(url, headers=headers)
-        return User.parse_response(response)
+        return check_response(response)
 
     def refresh_access_token(self, *, refresh_token: str) -> Session:
         """Generates a new JWT.
@@ -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)
 

tests/_async/test_api_with_auto_confirm_enabled.py

@@ -8,7 +8,7 @@
 from gotrue.types import CookieOptions, Session, User
 
 GOTRUE_URL = "http://localhost:9998"
-TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwicm9sZSI6InN1cGFiYXNlX2FkbWluIiwiaWF0IjoxNTE2MjM5MDIyfQ.0sOtTSTfPv5oPZxsjvBO249FI4S4p0ymHoIZ6H6z9Y8"  # noqa: E501
+TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoic2VydmljZV9yb2xlIiwiaWF0IjoxNjQyMjMyNzUwfQ.TUR8Zu05TtNR25L42soA2trZpc4oBR8-9Pv5r5bvls8"  # noqa: E501
 
 
 @pytest.fixture(name="api")
@@ -52,3 +52,14 @@ async def test_get_user(api: AsyncGoTrueAPI):
         assert isinstance(response, User)
     except Exception as e:
         assert False, str(e)
+
+
+@pytest.mark.asyncio
+@pytest.mark.depends(on=[test_get_user.__name__])
+async def test_delete_user(api: AsyncGoTrueAPI):
+    try:
+        jwt = valid_session.access_token if valid_session else ""
+        user = await api.get_user(jwt=jwt)
+        await api.delete_user(uid=str(user.id), jwt=TOKEN)
+    except Exception as e:
+        assert False, str(e)

tests/_sync/test_api_with_auto_confirm_enabled.py

@@ -8,7 +8,7 @@
 from gotrue.types import CookieOptions, Session, User
 
 GOTRUE_URL = "http://localhost:9998"
-TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwicm9sZSI6InN1cGFiYXNlX2FkbWluIiwiaWF0IjoxNTE2MjM5MDIyfQ.0sOtTSTfPv5oPZxsjvBO249FI4S4p0ymHoIZ6H6z9Y8"  # noqa: E501
+TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoic2VydmljZV9yb2xlIiwiaWF0IjoxNjQyMjMyNzUwfQ.TUR8Zu05TtNR25L42soA2trZpc4oBR8-9Pv5r5bvls8"  # noqa: E501
 
 
 @pytest.fixture(name="api")
@@ -52,3 +52,14 @@ def test_get_user(api: SyncGoTrueAPI):
         assert isinstance(response, User)
     except Exception as e:
         assert False, str(e)
+
+
+@pytest.mark.asyncio
+@pytest.mark.depends(on=[test_get_user.__name__])
+def test_delete_user(api: SyncGoTrueAPI):
+    try:
+        jwt = valid_session.access_token if valid_session else ""
+        user = api.get_user(jwt=jwt)
+        api.delete_user(uid=str(user.id), jwt=TOKEN)
+    except Exception as e:
+        assert False, str(e)