ReSync, fix merges

juancarlospaco · juancarlospaco · commit 96129b65d3c5 · 2024-06-03T19:44:26.000-03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
           # This action uses Python Semantic Release v8
       - name: Python Semantic Release
         id: release
-        uses: python-semantic-release/python-semantic-release@v9.5.0
+        uses: python-semantic-release/python-semantic-release@v9.8.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,7 +1,7 @@
 exclude: '^.*\.(md|MD)$'
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -10,7 +10,7 @@ repos:
         args: ["--fix=lf"]
 
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         args:
@@ -25,7 +25,7 @@ repos:
           ]
 
   - repo: https://github.com/myint/autoflake.git
-    rev: v2.2.1
+    rev: v2.3.1
     hooks:
       - id: autoflake
         args:
@@ -36,18 +36,18 @@ repos:
           ]
 
   - repo: https://github.com/ambv/black
-    rev: 22.6.0
+    rev: 24.4.0
     hooks:
       - id: black
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: ["--py37-plus", "--keep-runtime-typing"]
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v2.32.1
+    rev: v3.22.0
     hooks:
       - id: commitizen
         stages: [commit-msg]
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "supabase_auth"
-version = "2.4.2"
+version = "2.4.3"
 description = "Python Client Library for Supabase Auth"
 authors = ["Joel Lee <joel@joellee.org>"]
 homepage = "https://github.com/supabase-community/auth-py"
@@ -20,17 +20,17 @@ httpx = ">=0.23,<0.28"
 pydantic = ">=1.10,<3"
 
 [tool.poetry.dev-dependencies]
-pytest = "^8.1.0"
+pytest = "^8.2.1"
 flake8 = "^5.0.4"
 black = "^24.4.2"
 isort = "^5.12.0"
 pre-commit = "^3.4.0"
 pytest-cov = "^5.0.0"
 pytest-depends = "^1.0.1"
-pytest-asyncio = "^0.23.5"
-Faker = "^24.14.1"
+pytest-asyncio = "^0.23.7"
+Faker = "^25.3.0"
 unasync-cli = "^0.0.9"
-python-semantic-release = "^9.5.0"
+python-semantic-release = "^9.8.0"
 
 [tool.poetry.group.dev.dependencies]
 pygithub = ">=1.57,<3.0"
diff --git a/supabase_auth/__init__.py b/supabase_auth/__init__.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-__version__ = "2.4.2"
+__version__ = "2.4.3"
 
 from ._async.gotrue_admin_api import AsyncGoTrueAdminAPI  # type: ignore # noqa: F401
 from ._async.gotrue_client import AsyncGoTrueClient  # type: ignore # noqa: F401
diff --git a/supabase_auth/_async/gotrue_admin_api.py b/supabase_auth/_async/gotrue_admin_api.py
@@ -29,12 +29,14 @@ def __init__(
         url: str = "",
         headers: Dict[str, str] = {},
         http_client: Union[AsyncClient, None] = None,
+        verify: bool = True,
     ) -> None:
         AsyncGoTrueBaseAPI.__init__(
             self,
             url=url,
             headers=headers,
             http_client=http_client,
+            verify=verify,
         )
         self.mfa = AsyncGoTrueAdminMFAAPI()
         self.mfa.list_factors = self._list_factors
@@ -113,9 +115,11 @@ async def list_users(self, page: int = None, per_page: int = None) -> List[User]
             "GET",
             "admin/users",
             query={"page": page, "per_page": per_page},
-            xform=lambda data: [model_validate(User, user) for user in data["users"]]
-            if "users" in data
-            else [],
+            xform=lambda data: (
+                [model_validate(User, user) for user in data["users"]]
+                if "users" in data
+                else []
+            ),
         )
 
     async def get_user_by_id(self, uid: str) -> UserResponse:
diff --git a/supabase_auth/_async/gotrue_base_api.py b/supabase_auth/_async/gotrue_base_api.py
@@ -19,10 +19,11 @@ def __init__(
         url: str,
         headers: Dict[str, str],
         http_client: Union[AsyncClient, None],
+        verify: bool = True,
     ):
         self._url = url
         self._headers = headers
-        self._http_client = http_client or AsyncClient(follow_redirects=True)
+        self._http_client = http_client or AsyncClient(verify=bool(verify), follow_redirects=True)
 
     async def __aenter__(self) -> Self:
         return self
@@ -46,8 +47,7 @@ async def _request(
         body: Union[Any, None] = None,
         no_resolve_json: Literal[False] = False,
         xform: Callable[[Any], T],
-    ) -> T:
-        ...  # pragma: no cover
+    ) -> T: ...  # pragma: no cover
 
     @overload
     async def _request(
@@ -62,8 +62,7 @@ async def _request(
         body: Union[Any, None] = None,
         no_resolve_json: Literal[True],
         xform: Callable[[Response], T],
-    ) -> T:
-        ...  # pragma: no cover
+    ) -> T: ...  # pragma: no cover
 
     @overload
     async def _request(
@@ -77,8 +76,7 @@ async def _request(
         query: Union[Dict[str, str], None] = None,
         body: Union[Any, None] = None,
         no_resolve_json: bool = False,
-    ) -> None:
-        ...  # pragma: no cover
+    ) -> None: ...  # pragma: no cover
 
     async def _request(
         self,
diff --git a/supabase_auth/_async/gotrue_client.py b/supabase_auth/_async/gotrue_client.py
@@ -89,12 +89,14 @@ def __init__(
         storage: Union[AsyncSupportedStorage, None] = None,
         http_client: Union[AsyncClient, None] = None,
         flow_type: AuthFlowType = "implicit",
+        verify: bool = True,
     ) -> None:
         AsyncGoTrueBaseAPI.__init__(
             self,
             url=url or GOTRUE_URL,
             headers=headers or DEFAULT_HEADERS,
             http_client=http_client,
+            verify=verify,
         )
         self._storage_key = storage_key or STORAGE_KEY
         self._auto_refresh_token = auto_refresh_token
diff --git a/supabase_auth/_async/storage.py b/supabase_auth/_async/storage.py
@@ -6,16 +6,13 @@
 
 class AsyncSupportedStorage(ABC):
     @abstractmethod
-    async def get_item(self, key: str) -> Optional[str]:
-        ...  # pragma: no cover
+    async def get_item(self, key: str) -> Optional[str]: ...  # pragma: no cover
 
     @abstractmethod
-    async def set_item(self, key: str, value: str) -> None:
-        ...  # pragma: no cover
+    async def set_item(self, key: str, value: str) -> None: ...  # pragma: no cover
 
     @abstractmethod
-    async def remove_item(self, key: str) -> None:
-        ...  # pragma: no cover
+    async def remove_item(self, key: str) -> None: ...  # pragma: no cover
 
 
 class AsyncMemoryStorage(AsyncSupportedStorage):
diff --git a/supabase_auth/_sync/api.py b/supabase_auth/_sync/api.py
@@ -26,12 +26,13 @@ def __init__(
         headers: Dict[str, str],
         cookie_options: CookieOptions,
         http_client: Optional[SyncClient] = None,
+        verify: bool = True,
     ) -> None:
         """Initialise API class."""
         self.url = url
         self.headers = headers
         self.cookie_options = cookie_options
-        self.http_client = http_client or SyncClient(follow_redirects=True)
+        self.http_client = http_client or SyncClient(verify=bool(verify), follow_redirects=True)
 
     def __enter__(self) -> SyncGoTrueAPI:
         return self
@@ -136,8 +137,8 @@ def sign_up_with_email(
         data = {"email": email, "password": password, "data": data}
         url = f"{self.url}/signup{query_string}"
         response = self.http_client.post(url, json=data, headers=headers)
-        SessionOrUserModel = determine_session_or_user_model_from_response(response)
-        return SessionOrUserModel.parse_response(response)
+        session_or_user_model = determine_session_or_user_model_from_response(response)
+        return session_or_user_model.parse_response(response)
 
     def sign_in_with_email(
         self,
@@ -211,8 +212,8 @@ def sign_up_with_phone(
         data = {"phone": phone, "password": password, "data": data}
         url = f"{self.url}/signup"
         response = self.http_client.post(url, json=data, headers=headers)
-        SessionOrUserModel = determine_session_or_user_model_from_response(response)
-        return SessionOrUserModel.parse_response(response)
+        session_or_user_model = determine_session_or_user_model_from_response(response)
+        return session_or_user_model.parse_response(response)
 
     def sign_in_with_phone(
         self,
@@ -335,8 +336,8 @@ def verify_mobile_otp(
             data["redirect_to"] = redirect_to_encoded
         url = f"{self.url}/verify"
         response = self.http_client.post(url, json=data, headers=headers)
-        SessionOrUserModel = determine_session_or_user_model_from_response(response)
-        return SessionOrUserModel.parse_response(response)
+        session_or_user_model = determine_session_or_user_model_from_response(response)
+        return session_or_user_model.parse_response(response)
 
     def invite_user_by_email(
         self,
@@ -637,8 +638,8 @@ def generate_link(
             data["redirect_to"] = redirect_to_encoded
         url = f"{self.url}/admin/generate_link"
         response = self.http_client.post(url, json=data, headers=headers)
-        SessionOrUserModel = determine_session_or_user_model_from_response(response)
-        return SessionOrUserModel.parse_response(response)
+        session_or_user_model = determine_session_or_user_model_from_response(response)
+        return session_or_user_model.parse_response(response)
 
     def set_auth_cookie(self, *, req, res):
         """Stub for parity with JS api."""
diff --git a/supabase_auth/_sync/client.py b/supabase_auth/_sync/client.py
@@ -37,6 +37,7 @@ def __init__(
         cookie_options: CookieOptions = CookieOptions.parse_obj(COOKIE_OPTIONS),
         api: Optional[SyncGoTrueAPI] = None,
         replace_default_headers: bool = False,
+        verify: bool = True,
     ) -> None:
         """Create a new client
 
@@ -54,6 +55,8 @@ def __init__(
             The storage engine to use for persisting the session.
         cookie_options : CookieOptions
             The options for the cookie.
+        verify: bool
+            Verify SSL, True by default, False disables verification.
         """
         if url.startswith("http://"):
             print(
@@ -72,6 +75,7 @@ def __init__(
             "url": url,
             "headers": {**empty_or_default_headers, **headers},
             "cookie_options": cookie_options,
+            "verify": verify,
         }
         self.api = api or SyncGoTrueAPI(**args)
 
diff --git a/supabase_auth/_sync/gotrue_admin_api.py b/supabase_auth/_sync/gotrue_admin_api.py
@@ -29,12 +29,14 @@ def __init__(
         url: str = "",
         headers: Dict[str, str] = {},
         http_client: Union[SyncClient, None] = None,
+        verify: bool = True,
     ) -> None:
         SyncGoTrueBaseAPI.__init__(
             self,
             url=url,
             headers=headers,
             http_client=http_client,
+            verify=verify,
         )
         self.mfa = SyncGoTrueAdminMFAAPI()
         self.mfa.list_factors = self._list_factors
@@ -113,9 +115,11 @@ def list_users(self, page: int = None, per_page: int = None) -> List[User]:
             "GET",
             "admin/users",
             query={"page": page, "per_page": per_page},
-            xform=lambda data: [model_validate(User, user) for user in data["users"]]
-            if "users" in data
-            else [],
+            xform=lambda data: (
+                [model_validate(User, user) for user in data["users"]]
+                if "users" in data
+                else []
+            ),
         )
 
     def get_user_by_id(self, uid: str) -> UserResponse:
diff --git a/supabase_auth/_sync/gotrue_base_api.py b/supabase_auth/_sync/gotrue_base_api.py
@@ -19,10 +19,11 @@ def __init__(
         url: str,
         headers: Dict[str, str],
         http_client: Union[SyncClient, None],
+        verify: bool = True,
     ):
         self._url = url
         self._headers = headers
-        self._http_client = http_client or SyncClient(follow_redirects=True)
+        self._http_client = http_client or SyncClient(verify=bool(verify), follow_redirects=True)
 
     def __enter__(self) -> Self:
         return self
@@ -46,8 +47,7 @@ def _request(
         body: Union[Any, None] = None,
         no_resolve_json: Literal[False] = False,
         xform: Callable[[Any], T],
-    ) -> T:
-        ...  # pragma: no cover
+    ) -> T: ...  # pragma: no cover
 
     @overload
     def _request(
@@ -62,8 +62,7 @@ def _request(
         body: Union[Any, None] = None,
         no_resolve_json: Literal[True],
         xform: Callable[[Response], T],
-    ) -> T:
-        ...  # pragma: no cover
+    ) -> T: ...  # pragma: no cover
 
     @overload
     def _request(
@@ -77,8 +76,7 @@ def _request(
         query: Union[Dict[str, str], None] = None,
         body: Union[Any, None] = None,
         no_resolve_json: bool = False,
-    ) -> None:
-        ...  # pragma: no cover
+    ) -> None: ...  # pragma: no cover
 
     def _request(
         self,
diff --git a/supabase_auth/_sync/gotrue_client.py b/supabase_auth/_sync/gotrue_client.py
@@ -89,12 +89,14 @@ def __init__(
         storage: Union[SyncSupportedStorage, None] = None,
         http_client: Union[SyncClient, None] = None,
         flow_type: AuthFlowType = "implicit",
+        verify: bool = True,
     ) -> None:
         SyncGoTrueBaseAPI.__init__(
             self,
             url=url or GOTRUE_URL,
             headers=headers or DEFAULT_HEADERS,
             http_client=http_client,
+            verify=verify,
         )
         self._storage_key = storage_key or STORAGE_KEY
         self._auto_refresh_token = auto_refresh_token
diff --git a/supabase_auth/_sync/storage.py b/supabase_auth/_sync/storage.py
@@ -6,16 +6,13 @@
 
 class SyncSupportedStorage(ABC):
     @abstractmethod
-    def get_item(self, key: str) -> Optional[str]:
-        ...  # pragma: no cover
+    def get_item(self, key: str) -> Optional[str]: ...  # pragma: no cover
 
     @abstractmethod
-    def set_item(self, key: str, value: str) -> None:
-        ...  # pragma: no cover
+    def set_item(self, key: str, value: str) -> None: ...  # pragma: no cover
 
     @abstractmethod
-    def remove_item(self, key: str) -> None:
-        ...  # pragma: no cover
+    def remove_item(self, key: str) -> None: ...  # pragma: no cover
 
 
 class SyncMemoryStorage(SyncSupportedStorage):
diff --git a/supabase_auth/helpers.py b/supabase_auth/helpers.py
