fix: error in recovery_mode of get_session_from_url

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
 
   publish:
     needs: test
-    if: ${{ !startsWith(github.event.head_commit.message, 'bump:') && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+    if: ${{ !startsWith(github.event.head_commit.message, 'bump:') && !startsWith(github.event.head_commit.message, 'chore') && github.ref == 'refs/heads/main' && github.event_name == 'push' }}
     runs-on: ubuntu-latest
     name: "Bump version, create changelog and publish"
     steps:

Makefile

@@ -21,7 +21,7 @@ run_infra:
 
 clean_infra:
 	cd infra &&\
-	docker-compose down &&\
+	docker-compose down --remove-orphans &&\
 	docker system prune -a --volumes -f
 
 run_tests: run_infra sleep tests
@@ -33,4 +33,4 @@ build_run_tests: build_sync run_tests
 	echo "Done"
 
 sleep:
-	sleep 10
+	sleep 20

gotrue/_async/client.py

@@ -28,12 +28,13 @@ def __init__(
         self,
         *,
         url: str = GOTRUE_URL,
-        headers: Dict[str, str] = DEFAULT_HEADERS,
+        headers: Dict[str, str] = {},
         auto_refresh_token: bool = True,
         persist_session: bool = True,
         local_storage: AsyncSupportedStorage = AsyncMemoryStorage(),
         cookie_options: CookieOptions = CookieOptions.parse_obj(COOKIE_OPTIONS),
         api: Optional[AsyncGoTrueAPI] = None,
+        replace_default_headers: bool = False,
     ) -> None:
         """Create a new client
 
@@ -64,7 +65,12 @@ def __init__(
         self.auto_refresh_token = auto_refresh_token
         self.persist_session = persist_session
         self.local_storage = local_storage
-        args = {"url": url, "headers": headers, "cookie_options": cookie_options}
+        empty_or_default_headers = {} if replace_default_headers else DEFAULT_HEADERS
+        args = {
+            "url": url,
+            "headers": {**empty_or_default_headers, **headers},
+            "cookie_options": cookie_options,
+        }
         self.api = api if api else AsyncGoTrueAPI(**args)
 
     async def __aenter__(self) -> AsyncGoTrueClient:
@@ -411,12 +417,12 @@ async def get_session_from_url(
             raise APIError(error_description[0], 400)
         if not access_token or not access_token[0]:
             raise APIError("No access_token detected.", 400)
-        if not expires_in or not expires_in[0]:
-            raise APIError("No expires_in detected.", 400)
         if not refresh_token or not refresh_token[0]:
             raise APIError("No refresh_token detected.", 400)
         if not token_type or not token_type[0]:
             raise APIError("No token_type detected.", 400)
+        if not expires_in or not expires_in[0]:
+            raise APIError("No expires_in detected.", 400)
         try:
             expires_at = round(time()) + int(expires_in[0])
         except ValueError:
@@ -436,7 +442,7 @@ async def get_session_from_url(
             await self._save_session(session=session)
             recovery_mode = query.get("type")
             self._notify_all_subscribers(event=AuthChangeEvent.SIGNED_IN)
-            if recovery_mode == "recovery":
+            if recovery_mode and recovery_mode[0] == "recovery":
                 self._notify_all_subscribers(event=AuthChangeEvent.PASSWORD_RECOVERY)
         return session
 

gotrue/_sync/client.py

@@ -28,12 +28,13 @@ def __init__(
         self,
         *,
         url: str = GOTRUE_URL,
-        headers: Dict[str, str] = DEFAULT_HEADERS,
+        headers: Dict[str, str] = {},
         auto_refresh_token: bool = True,
         persist_session: bool = True,
         local_storage: SyncSupportedStorage = SyncMemoryStorage(),
         cookie_options: CookieOptions = CookieOptions.parse_obj(COOKIE_OPTIONS),
         api: Optional[SyncGoTrueAPI] = None,
+        replace_default_headers: bool = False,
     ) -> None:
         """Create a new client
 
@@ -64,7 +65,12 @@ def __init__(
         self.auto_refresh_token = auto_refresh_token
         self.persist_session = persist_session
         self.local_storage = local_storage
-        args = {"url": url, "headers": headers, "cookie_options": cookie_options}
+        empty_or_default_headers = {} if replace_default_headers else DEFAULT_HEADERS
+        args = {
+            "url": url,
+            "headers": {**empty_or_default_headers, **headers},
+            "cookie_options": cookie_options,
+        }
         self.api = api if api else SyncGoTrueAPI(**args)
 
     def __enter__(self) -> SyncGoTrueClient:
@@ -411,12 +417,12 @@ def get_session_from_url(
             raise APIError(error_description[0], 400)
         if not access_token or not access_token[0]:
             raise APIError("No access_token detected.", 400)
-        if not expires_in or not expires_in[0]:
-            raise APIError("No expires_in detected.", 400)
         if not refresh_token or not refresh_token[0]:
             raise APIError("No refresh_token detected.", 400)
         if not token_type or not token_type[0]:
             raise APIError("No token_type detected.", 400)
+        if not expires_in or not expires_in[0]:
+            raise APIError("No expires_in detected.", 400)
         try:
             expires_at = round(time()) + int(expires_in[0])
         except ValueError:
@@ -436,7 +442,7 @@ def get_session_from_url(
             self._save_session(session=session)
             recovery_mode = query.get("type")
             self._notify_all_subscribers(event=AuthChangeEvent.SIGNED_IN)
-            if recovery_mode == "recovery":
+            if recovery_mode and recovery_mode[0] == "recovery":
                 self._notify_all_subscribers(event=AuthChangeEvent.PASSWORD_RECOVERY)
         return session
 

gotrue/exceptions.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import asdict, dataclass
-from inspect import signature
 from typing import Any, Dict
 
 
@@ -16,15 +15,8 @@ def __post_init__(self) -> None:
 
     @classmethod
     def parse_dict(cls, **json: dict) -> APIError:
-        cls_fields = {field for field in signature(cls).parameters}
-        native_args, new_args = {}, {}
-        for name, val in json.items():
-            if name in cls_fields:
-                native_args[name] = val
-            else:
-                new_args[name] = val
-        ret = cls(**native_args)
-        for new_name, new_val in new_args.items():
+        ret = cls(msg="Unknown error", code=-1)
+        for new_name, new_val in json.items():
             setattr(ret, new_name, new_val)
         return ret
 
@@ -44,6 +36,15 @@ def from_dict(cls, data: dict) -> APIError:
                 msg=data["error_description"],
                 code=code,
             )
+        if "message" in data:
+            try:
+                code = int(data.get("code", -1))
+            except ValueError:
+                code = -1
+            return APIError(
+                msg=data["message"],
+                code=code,
+            )
         return cls.parse_dict(**data)
 
     def to_dict(self) -> Dict[str, Any]: