test: Fix failing tests

Author: KShivendu

supertokens_python/recipe/emailverification/recipe.py

@@ -281,6 +281,25 @@ def add_get_email_for_user_id_func(self, f: TypeGetEmailForUserIdFunction):
         self.get_email_for_user_id_funcs_from_other_recipes.append(f)
 
 
+class EmailVerificationClaimValidators(BooleanClaimValidators):
+    def is_verified(
+        self,
+        refetch_time_on_false_in_seconds: int = 10,
+        max_age_in_seconds: Optional[int] = None,
+        id_: Optional[str] = None,
+    ) -> SessionClaimValidator:
+        max_age_in_seconds = max_age_in_seconds or self.default_max_age_in_sec
+
+        assert isinstance(self.claim, EmailVerificationClaimClass)
+        return IsVerifiedSCV(
+            (id_ or self.claim.key),
+            self.claim,
+            self,
+            refetch_time_on_false_in_seconds,
+            max_age_in_seconds,
+        )
+
+
 class EmailVerificationClaimClass(BooleanClaim):
     def __init__(self):
         async def fetch_value(user_id: str, user_context: Dict[str, Any]) -> bool:
@@ -448,22 +467,3 @@ def should_refetch(
             and last_refetch_time
             < (get_timestamp_ms() - self.refetch_time_on_false_in_ms)
         )
-
-
-class EmailVerificationClaimValidators(BooleanClaimValidators):
-    def is_verified(
-        self,
-        refetch_time_on_false_in_seconds: int = 10,
-        max_age_in_seconds: Optional[int] = None,
-        id_: Optional[str] = None,
-    ) -> SessionClaimValidator:
-        max_age_in_seconds = max_age_in_seconds or self.default_max_age_in_sec
-
-        assert isinstance(self.claim, EmailVerificationClaimClass)
-        return IsVerifiedSCV(
-            (id_ or self.claim.key),
-            self.claim,
-            self,
-            refetch_time_on_false_in_seconds,
-            max_age_in_seconds,
-        )

tests/userroles/test_add_role_to_user.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python.querier import Querier
 from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 from supertokens_python.recipe.userroles import asyncio
@@ -43,7 +43,7 @@ async def test_add_new_role_to_user():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -81,7 +81,7 @@ async def test_add_duplicate_role_to_user():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -124,7 +124,7 @@ async def test_add_unknown_role_to_user():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_config.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python import InputAppInfo, SupertokensConfig, init
 from supertokens_python.querier import Querier
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 
@@ -41,7 +41,7 @@ async def test_recipe_works_without_config():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_create_new_role_or_add_permissions.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python import InputAppInfo, SupertokensConfig, init
 from supertokens_python.querier import Querier
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.recipe.userroles import asyncio, interfaces
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
@@ -42,7 +42,7 @@ async def test_create_new_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -69,7 +69,7 @@ async def test_create_new_role_twice():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -101,7 +101,7 @@ async def test_create_new_role_with_permissions():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -134,7 +134,7 @@ async def test_add_permissions_to_new_role_():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -172,7 +172,7 @@ async def test_add_duplicate_permission():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_delete_role.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python.querier import Querier
 from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 from supertokens_python.recipe.userroles import asyncio
@@ -43,7 +43,7 @@ async def test_create_and_assign_new_role_and_delete_it():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -90,7 +90,7 @@ async def test_delete_non_existent_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_get_permissions_for_role.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python import InputAppInfo, SupertokensConfig, init
 from supertokens_python.querier import Querier
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.recipe.userroles import asyncio, interfaces
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
@@ -42,7 +42,7 @@ async def test_get_permission_for_a_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -75,7 +75,7 @@ async def test_get_permission_for_non_existent_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_get_roles_for_user.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python.querier import Querier
 from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 from supertokens_python.recipe.userroles import asyncio
@@ -43,7 +43,7 @@ async def test_get_roles_for_user():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_get_roles_that_have_permissions.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python.querier import Querier
 from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 from supertokens_python.recipe.userroles import asyncio
@@ -43,7 +43,7 @@ async def test_get_roles_for_that_have_permission():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -77,7 +77,7 @@ async def test_get_roles_for_unknown_permission():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_get_users_that_have_role.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python.querier import Querier
 from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 from supertokens_python.recipe.userroles import asyncio
@@ -43,7 +43,7 @@ async def test_get_users_that_have_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -82,7 +82,7 @@ async def test_get_users_for_unknown_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_remove_permissions_from_role.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python.querier import Querier
 from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 from supertokens_python.recipe.userroles import asyncio
@@ -43,7 +43,7 @@ async def test_remove_permissions_from_a_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -80,7 +80,7 @@ async def test_remove_permissions_from_unknown_role():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 

tests/userroles/test_remove_user_role.py

@@ -15,7 +15,7 @@
 from pytest import mark, skip
 from supertokens_python.querier import Querier
 from supertokens_python import InputAppInfo, SupertokensConfig, init
-from supertokens_python.recipe import userroles
+from supertokens_python.recipe import userroles, session
 from supertokens_python.utils import is_version_gte
 from tests.utils import clean_st, reset, setup_st, start_st
 from supertokens_python.recipe.userroles import asyncio
@@ -43,7 +43,7 @@ async def test_remove_role_from_a_user():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -91,7 +91,7 @@ async def test_remove_unassigned_role_from_user():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()
 
@@ -124,7 +124,7 @@ async def test_remove_non_existent_role_from_user():
             website_domain="supertokens.io",
         ),
         framework="fastapi",
-        recipe_list=[userroles.init()],
+        recipe_list=[userroles.init(), session.init()],
     )
     start_st()