fix: webauthn email ingredient types, bump pyright

Author: namsnath

dev-requirements.txt

@@ -11,7 +11,7 @@ pdoc3==0.11.0
 pre-commit==3.5.0
 pyfakefs==5.7.4
 pylint==3.2.7
-pyright==1.1.393
+pyright==1.1.402
 python-dotenv==1.0.1
 pytest==8.3.3
 pytest-asyncio==0.24.0

supertokens_python/recipe/emailpassword/api/utils.py

@@ -13,7 +13,7 @@
 # under the License.
 from __future__ import annotations
 
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, cast
 
 from supertokens_python.exceptions import raise_bad_input_exception
 from supertokens_python.recipe.emailpassword.constants import (
@@ -78,7 +78,9 @@ async def validate_form_fields_or_throw_error(
 
     form_fields: List[FormField] = []
 
-    form_fields_list_raw: List[Dict[str, Any]] = form_fields_raw
+    form_fields_list_raw: List[Dict[str, Any]] = cast(
+        List[Dict[str, Any]], form_fields_raw
+    )
     for current_form_field in form_fields_list_raw:
         if (
             "id" not in current_form_field

supertokens_python/recipe/session/claim_base_classes/primitive_array_claim.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from typing import Any, Callable, Dict, Generic, List, Optional, TypeVar, Union
+from typing import Any, Callable, Dict, Generic, List, Optional, TypeVar, Union, cast
 
 from supertokens_python.types import MaybeAwaitable, RecipeUserId
 from supertokens_python.utils import get_timestamp_ms
@@ -105,7 +105,7 @@ async def _validate(
 
         # Doing this to ensure same code in the upcoming steps irrespective of
         # whether self.val is Primitive or PrimitiveList
-        vals: List[_T] = val if isinstance(val, list) else [val]
+        vals: List[_T] = cast(List[_T], val if isinstance(val, list) else [val])
 
         claim_val_set = set(claim_val)
         if is_include and not is_include_any:

supertokens_python/recipe/thirdparty/providers/apple.py

@@ -16,7 +16,7 @@
 import json
 from re import sub
 from time import time
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, cast
 
 from jwt import encode  # type: ignore
 
@@ -106,7 +106,7 @@ async def get_user_info(
             if isinstance(user, str):
                 user_dict = json.loads(user)
             elif isinstance(user, dict):
-                user_dict = user
+                user_dict = cast(Dict[str, Any], user)
             else:
                 return response
 

supertokens_python/recipe/thirdparty/providers/custom.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Dict, List, Optional, Union
+from typing import Any, Callable, Dict, List, Optional, Union, cast
 from urllib.parse import parse_qs, urlencode, urlparse
 
 import pkce
@@ -67,7 +67,7 @@ def access_field(obj: Any, key: str) -> Any:
     key_parts = key.split(".")
     for part in key_parts:
         if isinstance(obj, dict):
-            obj = obj.get(part)  # type: ignore
+            obj = cast(Dict[str, Any], obj).get(part)
         else:
             return None
 

supertokens_python/recipe/webauthn/interfaces/api.py

@@ -12,8 +12,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from abc import ABC, abstractmethod
-from typing import List, Literal, Optional, TypedDict, Union
+from abc import abstractmethod
+from typing import TYPE_CHECKING, List, Literal, Optional, TypedDict, Union
 
 from typing_extensions import NotRequired, Unpack
 

supertokens_python/recipe/webauthn/types/config.py

@@ -17,6 +17,7 @@
 from typing import Optional, Protocol, TypeVar, Union, runtime_checkable
 
 from supertokens_python.framework import BaseRequest
+from supertokens_python.ingredients.emaildelivery import EmailDeliveryIngredient
 from supertokens_python.ingredients.emaildelivery.types import (
     EmailDeliveryConfig,
     EmailDeliveryConfigWithService,
@@ -192,12 +193,7 @@ class WebauthnConfig(BaseConfig[RecipeInterface, APIInterface]):
     get_relying_party_id: Optional[Union[str, GetRelyingPartyId]] = None
     get_relying_party_name: Optional[Union[str, GetRelyingPartyName]] = None
     get_origin: Optional[GetOrigin] = None
-    email_delivery: Optional[
-        Union[
-            EmailDeliveryConfig[TypeWebauthnEmailDeliveryInput],
-            EmailDeliveryConfigWithService[TypeWebauthnEmailDeliveryInput],
-        ]
-    ] = None
+    email_delivery: Optional[EmailDeliveryConfig[TypeWebauthnEmailDeliveryInput]] = None
     validate_email_address: Optional[ValidateEmailAddress] = None
 
 
@@ -211,8 +207,5 @@ class NormalisedWebauthnConfig(BaseNormalisedConfig[RecipeInterface, APIInterfac
 
 class WebauthnIngredients(CamelCaseBaseModel):
     email_delivery: Optional[
-        Union[
-            EmailDeliveryConfig[TypeWebauthnEmailDeliveryInput],
-            EmailDeliveryConfigWithService[TypeWebauthnEmailDeliveryInput],
-        ]
+        EmailDeliveryIngredient[TypeWebauthnEmailDeliveryInput]
     ] = None

tests/auth-react/django3x/mysite/utils.py

@@ -8,7 +8,7 @@
 from supertokens_python import InputAppInfo, Supertokens, SupertokensConfig, init
 from supertokens_python.framework.request import BaseRequest
 from supertokens_python.ingredients.emaildelivery.types import (
-    EmailDeliveryConfigWithService,
+    EmailDeliveryConfig,
     EmailDeliveryInterface,
 )
 from supertokens_python.recipe import (
@@ -999,9 +999,9 @@ async def resync_session_and_fetch_mfa_info_put(
             "id": "webauthn",
             "init": webauthn.init(
                 config=WebauthnConfig(
-                    email_delivery=EmailDeliveryConfigWithService[
-                        TypeWebauthnEmailDeliveryInput
-                    ](service=CustomWebwuthnEmailService())  # type: ignore
+                    email_delivery=EmailDeliveryConfig[TypeWebauthnEmailDeliveryInput](
+                        service=CustomWebwuthnEmailService()
+                    )
                 )
             ),
         },

tests/auth-react/fastapi-server/app.py

@@ -41,7 +41,7 @@
 from supertokens_python.framework.fastapi import get_middleware
 from supertokens_python.framework.request import BaseRequest
 from supertokens_python.ingredients.emaildelivery.types import (
-    EmailDeliveryConfigWithService,
+    EmailDeliveryConfig,
     EmailDeliveryInterface,
 )
 from supertokens_python.recipe import (
@@ -1100,9 +1100,9 @@ async def resync_session_and_fetch_mfa_info_put(
             "id": "webauthn",
             "init": webauthn.init(
                 config=WebauthnConfig(
-                    email_delivery=EmailDeliveryConfigWithService[
-                        TypeWebauthnEmailDeliveryInput
-                    ](service=CustomWebwuthnEmailService())  # type: ignore
+                    email_delivery=EmailDeliveryConfig[TypeWebauthnEmailDeliveryInput](
+                        service=CustomWebwuthnEmailService()
+                    )
                 )
             ),
         },

tests/auth-react/flask-server/app.py

@@ -32,7 +32,7 @@
 from supertokens_python.framework.flask.flask_middleware import Middleware
 from supertokens_python.framework.request import BaseRequest
 from supertokens_python.ingredients.emaildelivery.types import (
-    EmailDeliveryConfigWithService,
+    EmailDeliveryConfig,
     EmailDeliveryInterface,
 )
 from supertokens_python.recipe import (
@@ -1079,9 +1079,9 @@ async def resync_session_and_fetch_mfa_info_put(
             "id": "webauthn",
             "init": webauthn.init(
                 config=WebauthnConfig(
-                    email_delivery=EmailDeliveryConfigWithService[
-                        TypeWebauthnEmailDeliveryInput
-                    ](service=CustomWebwuthnEmailService())  # type: ignore
+                    email_delivery=EmailDeliveryConfig[TypeWebauthnEmailDeliveryInput](
+                        service=CustomWebwuthnEmailService()
+                    )
                 )
             ),
         },