feat: More of requested changes

Author: KShivendu

supertokens_python/recipe/session/api/implementation.py

@@ -43,7 +43,7 @@ async def refresh_post(
     async def signout_post(
         self,
         api_options: APIOptions,
-        session: SessionContainer,
+        session: Optional[SessionContainer],
         user_context: Dict[str, Any],
     ) -> SignOutOkayResponse:
         if session is not None:

supertokens_python/recipe/session/claim_base_classes/primitive_array_claim.py

@@ -23,11 +23,12 @@
     SessionClaim,
     SessionClaimValidator,
     ClaimValidationResult,
+    JSONPrimitiveList,
 )
 
 
 Primitive = TypeVar("Primitive", bound=JSONPrimitive)
-PrimitiveList = TypeVar("PrimitiveList", bound=List[JSONPrimitive])
+PrimitiveList = TypeVar("PrimitiveList", bound=JSONPrimitiveList)
 
 _T = TypeVar("_T")
 
@@ -218,7 +219,7 @@ def excludes_all(
         )
 
 
-class PrimitiveArrayClaim(SessionClaim[PrimitiveList]):
+class PrimitiveArrayClaim(SessionClaim[PrimitiveList], Generic[PrimitiveList]):
     def __init__(
         self,
         key: str,

supertokens_python/recipe/session/interfaces.py

@@ -27,7 +27,7 @@
 )
 
 from supertokens_python.async_to_sync_wrapper import sync
-from supertokens_python.types import APIResponse, GeneralErrorResponse, MaybeAwaitable
+from supertokens_python.types import APIResponse, MaybeAwaitable
 from .exceptions import ClaimValidationError
 from .utils import SessionConfig
 from ...utils import resolve
@@ -78,6 +78,9 @@ def __init__(
 JSONObject = Dict[str, Any]
 
 JSONPrimitive = Union[str, int, bool, None, Dict[str, Any]]
+JSONPrimitiveList = Union[
+    List[str], List[int], List[bool], List[None], List[Dict[str, Any]]
+]
 
 FetchValueReturnType = Union[_T, None]
 
@@ -324,7 +327,7 @@ async def signout_post(
         api_options: APIOptions,
         session: Optional[SessionContainer],
         user_context: Dict[str, Any],
-    ) -> Union[SignOutOkayResponse, GeneralErrorResponse]:
+    ) -> SignOutOkayResponse:
         pass
 
     @abstractmethod

supertokens_python/recipe/session/with_jwt/recipe_implementation.py

@@ -13,12 +13,13 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Dict, Union
+from typing import TYPE_CHECKING, Any, Dict, Union, Optional, List, Callable
 
 # TODO: Missing changes for session_class inside with_jwt? supertokens/supertokens-node#278 (files)
 
 from jwt import decode
 
+from supertokens_python.types import MaybeAwaitable
 from supertokens_python.utils import get_timestamp_ms
 
 from .constants import ACCESS_TOKEN_PAYLOAD_JWT_PROPERTY_NAME_KEY
@@ -31,6 +32,7 @@
         RecipeInterface,
         SessionContainer,
         SessionInformationResult,
+        SessionClaimValidator,
     )
     from supertokens_python.framework.types import BaseRequest
 
@@ -91,12 +93,19 @@ async def get_session(
         request: BaseRequest,
         anti_csrf_check: Union[bool, None],
         session_required: bool,
+        override_global_claim_validators: Optional[
+            Callable[
+                [List[SessionClaimValidator], SessionContainer, Dict[str, Any]],
+                MaybeAwaitable[List[SessionClaimValidator]],
+            ]
+        ],
         user_context: Dict[str, Any],
     ) -> Union[SessionContainer, None]:
         session_container = await og_get_session(
             request,
             anti_csrf_check,
             session_required,
+            override_global_claim_validators,
             user_context,
         )
         if session_container is None:

supertokens_python/recipe/thirdparty/api/implementation.py

@@ -159,7 +159,7 @@ async def sign_in_up_post(
             return SignInUpPostNoEmailGivenByProviderResponse()
 
         signinup_response = await api_options.recipe_implementation.sign_in_up(
-            provider.id, user_info.user_id, email, email_verified, user_context
+            provider.id, user_info.user_id, email, user_context
         )
 
         if email_verified:

supertokens_python/recipe/thirdparty/asyncio/__init__.py

@@ -57,11 +57,10 @@ async def sign_in_up(
     third_party_id: str,
     third_party_user_id: str,
     email: str,
-    email_verified: bool,
     user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}
     return await ThirdPartyRecipe.get_instance().recipe_implementation.sign_in_up(
-        third_party_id, third_party_user_id, email, email_verified, user_context
+        third_party_id, third_party_user_id, email, user_context
     )

supertokens_python/recipe/thirdparty/interfaces.py

@@ -65,7 +65,6 @@ async def sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> SignInUpOkResult:
         pass

supertokens_python/recipe/thirdparty/recipe_implementation.py

@@ -101,13 +101,12 @@ async def sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> SignInUpOkResult:
         data = {
             "thirdPartyId": third_party_id,
             "thirdPartyUserId": third_party_user_id,
-            "email": {"id": email, "isVerified": email_verified},
+            "email": {"id": email},
         }
         response = await self.querier.send_post_request(
             NormalisedURLPath("/recipe/signinup"), data

supertokens_python/recipe/thirdparty/syncio/__init__.py

@@ -52,13 +52,8 @@ def sign_in_up(
     third_party_id: str,
     third_party_user_id: str,
     email: str,
-    email_verified: bool,
     user_context: Union[None, Dict[str, Any]] = None,
 ):
     from supertokens_python.recipe.thirdparty.asyncio import sign_in_up
 
-    return sync(
-        sign_in_up(
-            third_party_id, third_party_user_id, email, email_verified, user_context
-        )
-    )
+    return sync(sign_in_up(third_party_id, third_party_user_id, email, user_context))

supertokens_python/recipe/thirdpartyemailpassword/asyncio/__init__.py

@@ -47,13 +47,12 @@ async def thirdparty_sign_in_up(
     third_party_id: str,
     third_party_user_id: str,
     email: str,
-    email_verified: bool,
     user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}
     return await ThirdPartyEmailPasswordRecipe.get_instance().recipe_implementation.thirdparty_sign_in_up(
-        third_party_id, third_party_user_id, email, email_verified, user_context
+        third_party_id, third_party_user_id, email, user_context
     )
 
 

supertokens_python/recipe/thirdpartyemailpassword/interfaces.py

@@ -97,7 +97,6 @@ async def thirdparty_sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> ThirdPartySignInUpOkResult:
         pass

supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/implementation.py

@@ -196,13 +196,12 @@ async def thirdparty_sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> ThirdPartySignInUpOkResult:
         if self.tp_sign_in_up is None:
             raise Exception("No thirdparty provider configured")
         result = await self.tp_sign_in_up(
-            third_party_id, third_party_user_id, email, email_verified, user_context
+            third_party_id, third_party_user_id, email, user_context
         )
         return ThirdPartySignInUpOkResult(
             User(

supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/third_party_recipe_implementation.py

@@ -87,11 +87,10 @@ async def sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> SignInUpOkResult:
         result = await self.recipe_implementation.thirdparty_sign_in_up(
-            third_party_id, third_party_user_id, email, email_verified, user_context
+            third_party_id, third_party_user_id, email, user_context
         )
 
         if result.user.third_party_info is None:

supertokens_python/recipe/thirdpartyemailpassword/syncio/__init__.py

@@ -49,17 +49,14 @@ def thirdparty_sign_in_up(
     third_party_id: str,
     third_party_user_id: str,
     email: str,
-    email_verified: bool,
     user_context: Union[None, Dict[str, Any]] = None,
 ):
     from supertokens_python.recipe.thirdpartyemailpassword.asyncio import (
         thirdparty_sign_in_up,
     )
 
     return sync(
-        thirdparty_sign_in_up(
-            third_party_id, third_party_user_id, email, email_verified, user_context
-        )
+        thirdparty_sign_in_up(third_party_id, third_party_user_id, email, user_context)
     )
 
 

supertokens_python/recipe/thirdpartypasswordless/asyncio/__init__.py

@@ -50,13 +50,12 @@ async def thirdparty_sign_in_up(
     third_party_id: str,
     third_party_user_id: str,
     email: str,
-    email_verified: bool,
     user_context: Union[None, Dict[str, Any]] = None,
 ):
     if user_context is None:
         user_context = {}
     return await ThirdPartyPasswordlessRecipe.get_instance().recipe_implementation.thirdparty_sign_in_up(
-        third_party_id, third_party_user_id, email, email_verified, user_context
+        third_party_id, third_party_user_id, email, user_context
     )
 
 

supertokens_python/recipe/thirdpartypasswordless/interfaces.py

@@ -106,7 +106,6 @@ async def thirdparty_sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> ThirdPartySignInUpOkResult:
         pass

supertokens_python/recipe/thirdpartypasswordless/recipeimplementation/implementation.py

@@ -242,13 +242,12 @@ async def thirdparty_sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> SignInUpOkResult:
         if self.tp_sign_in_up is None:
             raise Exception("No thirdparty provider configured")
         return await self.tp_sign_in_up(
-            third_party_id, third_party_user_id, email, email_verified, user_context
+            third_party_id, third_party_user_id, email, user_context
         )
 
     async def get_user_by_phone_number(

supertokens_python/recipe/thirdpartypasswordless/recipeimplementation/third_party_recipe_implementation.py

@@ -95,9 +95,8 @@ async def sign_in_up(
         third_party_id: str,
         third_party_user_id: str,
         email: str,
-        email_verified: bool,
         user_context: Dict[str, Any],
     ) -> SignInUpOkResult:
         return await self.recipe_implementation.thirdparty_sign_in_up(
-            third_party_id, third_party_user_id, email, email_verified, user_context
+            third_party_id, third_party_user_id, email, user_context
         )

supertokens_python/recipe/thirdpartypasswordless/syncio/__init__.py

@@ -48,15 +48,12 @@ def thirdparty_sign_in_up(
     third_party_id: str,
     third_party_user_id: str,
     email: str,
-    email_verified: bool,
     user_context: Union[None, Dict[str, Any]] = None,
 ):
     from ..asyncio import thirdparty_sign_in_up
 
     return sync(
-        thirdparty_sign_in_up(
-            third_party_id, third_party_user_id, email, email_verified, user_context
-        )
+        thirdparty_sign_in_up(third_party_id, third_party_user_id, email, user_context)
     )
 
 

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

@@ -585,7 +585,7 @@ def override_session_apis(original_implementation: SessionAPIInterface):
 
         async def signout_post(
             api_options: SAPIOptions,
-            session: SessionContainer,
+            session: Optional[SessionContainer],
             user_context: Dict[str, Any],
         ):
             is_general_error = await check_for_general_error(

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

@@ -637,7 +637,7 @@ def override_session_apis(original_implementation: SessionAPIInterface):
 
         async def signout_post(
             api_options: SAPIOptions,
-            session: SessionContainer,
+            session: Optional[SessionContainer],
             user_context: Dict[str, Any],
         ):
             is_general_error = await check_for_general_error(

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

@@ -607,7 +607,7 @@ def override_session_apis(original_implementation: SessionAPIInterface):
 
         async def signout_post(
             api_options: SAPIOptions,
-            session: SessionContainer,
+            session: Optional[SessionContainer],
             user_context: Dict[str, Any],
         ):
             is_general_error = await check_for_general_error(

tests/thirdparty/test_emaildelivery.py

@@ -142,7 +142,7 @@ async def test_email_verify_default_backward_compatibility(
     )
     start_st()
 
-    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]", False)
+    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]")
 
     s = SessionRecipe.get_instance()
     if not isinstance(s.recipe_implementation, SessionRecipeImplementation):
@@ -213,7 +213,7 @@ async def test_email_verify_default_backward_compatibility_supress_error(
     )
     start_st()
 
-    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]", False)
+    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]")
 
     s = SessionRecipe.get_instance()
     if not isinstance(s.recipe_implementation, SessionRecipeImplementation):
@@ -292,7 +292,7 @@ async def create_and_send_custom_email(
     )
     start_st()
 
-    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]", False)
+    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]")
 
     s = SessionRecipe.get_instance()
     if not isinstance(s.recipe_implementation, SessionRecipeImplementation):
@@ -367,7 +367,7 @@ async def send_email(
     )
     start_st()
 
-    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]", False)
+    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]")
 
     s = SessionRecipe.get_instance()
     if not isinstance(s.recipe_implementation, SessionRecipeImplementation):
@@ -504,7 +504,7 @@ async def send_email_override(
     )
     start_st()
 
-    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]", False)
+    resp = await sign_in_up("supertokens", "test-user-id", "[email protected]")
 
     s = SessionRecipe.get_instance()
     if not isinstance(s.recipe_implementation, SessionRecipeImplementation):

tests/thirdpartyemailpassword/test_email_delivery.py

@@ -892,7 +892,7 @@ async def custom_create_and_send_custom_email(
     start_st()
 
     resp = await thirdparty_sign_in_up(
-        "supertokens", "test-user-id", "[email protected]", False
+        "supertokens", "test-user-id", "[email protected]"
     )
     user_id: str = resp.user.user_id  # type: ignore
 
@@ -956,7 +956,7 @@ async def custom_create_and_send_custom_email(
     start_st()
 
     resp = await thirdparty_sign_in_up(
-        "supertokens", "test-user-id", "[email protected]", False
+        "supertokens", "test-user-id", "[email protected]"
     )
     user_id: str = resp.user.user_id  # type: ignore