feat: last changes

Author: KShivendu

supertokens_python/recipe/emailverification/asyncio/__init__.py

@@ -82,7 +82,7 @@ async def is_email_verified(
     )
 
 
-async def revoke_email_verification_token(
+async def revoke_email_verification_tokens(
     user_id: str,
     email: Optional[str] = None,
     user_context: Optional[Dict[str, Any]] = None,
@@ -130,16 +130,6 @@ async def unverify_email(
     )
 
 
-async def revoke_email_verification_tokens(
-    user_id: str, email: str, user_context: Union[None, Dict[str, Any]] = None
-):
-    if user_context is None:
-        user_context = {}
-    return await EmailVerificationRecipe.get_instance().recipe_implementation.revoke_email_verification_tokens(
-        user_id, email, user_context
-    )
-
-
 async def send_email(
     input_: EmailTemplateVars, user_context: Union[None, Dict[str, Any]] = None
 ):

supertokens_python/recipe/emailverification/syncio/__init__.py

@@ -56,14 +56,16 @@ def revoke_email_verification_token(
     user_context: Optional[Dict[str, Any]] = None,
 ):
     from supertokens_python.recipe.emailverification.asyncio import (
-        revoke_email_verification_token,
+        revoke_email_verification_tokens,
     )
 
-    return sync(revoke_email_verification_token(user_id, email, user_context))
+    return sync(revoke_email_verification_tokens(user_id, email, user_context))
 
 
 def unverify_email(
-    user_id: str, email: str, user_context: Union[None, Dict[str, Any]] = None
+    user_id: str,
+    email: Optional[str] = None,
+    user_context: Union[None, Dict[str, Any]] = None,
 ):
     from supertokens_python.recipe.emailverification.asyncio import is_email_verified
 

supertokens_python/recipe/session/api/signout.py

@@ -31,7 +31,7 @@ async def handle_signout_api(api_implementation: APIInterface, api_options: APIO
 
     session = await api_options.recipe_implementation.get_session(
         request=api_options.request,
-        anti_csrf_check=None,  # TODO: What should I pass here?
+        anti_csrf_check=None,
         session_required=False,
         user_context=user_context,
     )

supertokens_python/recipe/session/interfaces.py

@@ -232,7 +232,7 @@ async def fetch_and_set_claim(
         self,
         session_handle: str,
         claim: SessionClaim[Any],
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ) -> bool:
         pass
 
@@ -242,7 +242,7 @@ async def set_claim_value(
         session_handle: str,
         claim: SessionClaim[_T],
         value: _T,
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ) -> bool:
         pass
 
@@ -251,7 +251,7 @@ async def get_claim_value(
         self,
         session_handle: str,
         claim: SessionClaim[Any],
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ) -> Union[SessionDoesNotExistError, GetClaimValueOkResult[Any]]:
         pass
 
@@ -260,7 +260,7 @@ async def remove_claim(
         self,
         session_handle: str,
         claim: SessionClaim[Any],
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ) -> bool:
         pass
 

supertokens_python/recipe/session/recipe_implementation.py

@@ -433,11 +433,8 @@ async def fetch_and_set_claim(
         self,
         session_handle: str,
         claim: SessionClaim[Any],
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ) -> bool:
-        if user_context is None:
-            user_context = {}
-
         session_info = await self.get_session_information(session_handle, user_context)
         if session_info is None:
             return False
@@ -454,11 +451,8 @@ async def set_claim_value(
         session_handle: str,
         claim: SessionClaim[Any],
         value: Any,
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ):
-        if user_context is None:
-            user_context = {}
-
         access_token_payload_update = claim.add_to_payload_({}, value, user_context)
         return await self.merge_into_access_token_payload(
             session_handle, access_token_payload_update, user_context
@@ -468,11 +462,8 @@ async def get_claim_value(
         self,
         session_handle: str,
         claim: SessionClaim[Any],
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ) -> Union[SessionDoesNotExistError, GetClaimValueOkResult[Any]]:
-        if user_context is None:
-            user_context = {}
-
         session_info = await self.get_session_information(session_handle, user_context)
         if session_info is None:
             return SessionDoesNotExistError()
@@ -495,11 +486,8 @@ async def remove_claim(
         self,
         session_handle: str,
         claim: SessionClaim[Any],
-        user_context: Optional[Dict[str, Any]] = None,
+        user_context: Dict[str, Any],
     ) -> bool:
-        if user_context is None:
-            user_context = {}
-
         access_token_payload = claim.remove_from_payload_by_merge_({}, user_context)
         return await self.merge_into_access_token_payload(
             session_handle, access_token_payload, user_context

tests/emailpassword/test_emailverify.py

@@ -27,7 +27,7 @@
 from supertokens_python.recipe.emailverification.asyncio import (
     create_email_verification_token,
     is_email_verified,
-    revoke_email_verification_token,
+    revoke_email_verification_tokens,
     unverify_email,
     verify_email_using_token,
 )
@@ -1021,7 +1021,7 @@ async def test_the_generate_token_api_with_valid_input_and_then_remove_token(
     user_id = dict_response["user"]["id"]
 
     verify_token = await create_email_verification_token(user_id)
-    await revoke_email_verification_token(user_id)
+    await revoke_email_verification_tokens(user_id)
 
     if isinstance(verify_token, CreateEmailVerificationTokenOkResult):
         response = await verify_email_using_token(verify_token.token)