test: Fix failing tests

Author: KShivendu

supertokens_python/recipe/session/recipe.py

@@ -26,6 +26,7 @@
     TokenTheftError,
     UnauthorisedError,
     InvalidClaimsError,
+    TryRefreshTokenError,
 )
 from ...types import MaybeAwaitable
 
@@ -239,10 +240,14 @@ async def handle_error(
             return await self.config.error_handlers.on_invalid_claim(
                 self, request, err.payload, response
             )
-        log_debug_message("errorHandler: returning TRY_REFRESH_TOKEN")
-        return await self.config.error_handlers.on_try_refresh_token(
-            request, str(err), response
-        )
+        if isinstance(err, TryRefreshTokenError):
+            log_debug_message("errorHandler: returning TRY_REFRESH_TOKEN")
+            return await self.config.error_handlers.on_try_refresh_token(
+                request, str(err), response
+            )
+
+        # TODO: Is raising err okay?
+        raise err
 
     def get_all_cors_headers(self) -> List[str]:
         cors_headers = get_cors_allowed_headers()

tests/emailpassword/test_emailverify.py

@@ -48,6 +48,7 @@
     get_session,
     refresh_session,
 )
+from supertokens_python.recipe.session.constants import ANTI_CSRF_HEADER_KEY
 from supertokens_python.utils import is_version_gte
 from tests.utils import (
     TEST_ACCESS_TOKEN_MAX_AGE_CONFIG_KEY,
@@ -133,7 +134,11 @@ async def test_the_generate_token_api_with_valid_input_email_not_verified(
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[session.init(anti_csrf="VIA_TOKEN"), emailpassword.init()],
+        recipe_list=[
+            session.init(anti_csrf="VIA_TOKEN"),
+            emailverification.init("OPTIONAL"),
+            emailpassword.init(),
+        ],
     )
     start_st()
 
@@ -170,7 +175,11 @@ async def test_the_generate_token_api_with_valid_input_email_verified_and_test_e
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[session.init(anti_csrf="VIA_TOKEN"), emailpassword.init()],
+        recipe_list=[
+            session.init(anti_csrf="VIA_TOKEN"),
+            emailverification.init("OPTIONAL"),
+            emailpassword.init(),
+        ],
     )
     start_st()
 
@@ -213,7 +222,11 @@ async def test_the_generate_token_api_with_valid_input_no_session_and_check_outp
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[session.init(anti_csrf="VIA_TOKEN"), emailpassword.init()],
+        recipe_list=[
+            session.init(anti_csrf="VIA_TOKEN"),
+            emailverification.init("OPTIONAL"),
+            emailpassword.init(),
+        ],
     )
     start_st()
 
@@ -238,7 +251,11 @@ async def test_the_generate_token_api_with_an_expired_access_token_and_see_that_
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[session.init(anti_csrf="VIA_TOKEN"), emailpassword.init()],
+        recipe_list=[
+            session.init(anti_csrf="VIA_TOKEN"),
+            emailverification.init("OPTIONAL"),
+            emailpassword.init(),
+        ],
     )
     start_st()
 
@@ -723,7 +740,9 @@ async def custom_f(
     assert token is not None
 
     response_3 = driver_config_client.post(
-        url="/auth/user/email/verify", json={"method": "token", "token": token}
+        url="/auth/user/email/verify",
+        json={"method": "token", "token": token},
+        headers={ANTI_CSRF_HEADER_KEY: response_1.headers.get("anti-csrf")},
     )
 
     dict_response = json.loads(response_3.text)
@@ -760,7 +779,11 @@ async def test_the_email_verify_with_no_session_using_the_get_method(
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[session.init(anti_csrf="VIA_TOKEN"), emailpassword.init()],
+        recipe_list=[
+            session.init(anti_csrf="VIA_TOKEN"),
+            emailverification.init("OPTIONAL"),
+            emailpassword.init(),
+        ],
     )
     start_st()
 
@@ -850,7 +873,9 @@ async def email_verify_post(
     assert token is not None
 
     response_3 = driver_config_client.post(
-        url="/auth/user/email/verify", json={"method": "token", "token": token}
+        url="/auth/user/email/verify",
+        json={"method": "token", "token": token},
+        headers={ANTI_CSRF_HEADER_KEY: response_1.headers.get("anti-csrf")},
     )
 
     dict_response = json.loads(response_3.text)
@@ -946,7 +971,9 @@ async def email_verify_post(
     assert token is not None
 
     response_3 = driver_config_client.post(
-        url="/auth/user/email/verify", json={"method": "token", "token": token}
+        url="/auth/user/email/verify",
+        json={"method": "token", "token": token},
+        headers={ANTI_CSRF_HEADER_KEY: response_1.headers.get("anti-csrf")},
     )
 
     dict_response = json.loads(response_3.text)
@@ -974,7 +1001,11 @@ async def test_the_generate_token_api_with_valid_input_and_then_remove_token(
             api_base_path="/auth",
         ),
         framework="fastapi",
-        recipe_list=[session.init(anti_csrf="VIA_TOKEN"), emailpassword.init()],
+        recipe_list=[
+            session.init(anti_csrf="VIA_TOKEN"),
+            emailverification.init("OPTIONAL"),
+            emailpassword.init(),
+        ],
     )
     start_st()
 

tests/input_validation/test_input_validation.py

@@ -88,7 +88,7 @@ async def test_init_validation_emailpassword():
             ],
         )
     assert (
-        "email_verification_feature must be of type InputEmailVerificationConfig or None"
+        "Email Verification recipe mode must be one of 'REQUIRED' or 'OPTIONAL'"
         == str(ex.value)
     )
 
@@ -473,7 +473,7 @@ async def test_init_validation_thirdpartyemailpassword():
             ],
         )
     assert (
-        "email_verification_feature must be of type InputEmailVerificationConfig or None"
+        "Email Verification recipe mode must be one of 'REQUIRED' or 'OPTIONAL'"
         == str(ex.value)
     )
 
@@ -608,7 +608,7 @@ async def test_init_validation_thirdpartypasswordless():
             ],
         )
     assert (
-        "email_verification_feature must be an instance of InputEmailVerificationConfig or None"
+        "Email Verification recipe mode must be one of 'REQUIRED' or 'OPTIONAL'"
         == str(ex.value)
     )