refactor:remaining changes

Author: KShivendu

supertokens_python/recipe/emailverification/ev_claim.py

@@ -33,11 +33,13 @@ def __init__(
         claim: BooleanClaim,
         has_value_validator: SessionClaimValidator,
         refetch_time_on_false_in_seconds: int,
+        max_age_in_seconds: int,
     ):
         super().__init__("st-ev-is-verified")
         self.claim: BooleanClaim = claim  # TODO: Should work without specifying type of self.claim (no pyright errors)
         self.has_value_validator = has_value_validator
         self.refetch_time_on_false_in_ms = refetch_time_on_false_in_seconds * 1000
+        self.max_age_in_ms = max_age_in_seconds * 1000
 
     async def validate(
         self, payload: JSONObject, user_context: Dict[str, Any]
@@ -50,21 +52,31 @@ def should_refetch(
         value = self.claim.get_value_from_payload(payload, user_context)
         last_refetch_time = self.claim.get_last_refetch_time(payload, user_context)
         assert last_refetch_time is not None
-        return (value is None) or (
-            value is False
-            and last_refetch_time
-            < (
-                get_timestamp_ms() - self.refetch_time_on_false_in_ms
-            )  # TODO: Default 5 min?
+
+        return (
+            (value is None)
+            or (last_refetch_time < get_timestamp_ms() - self.max_age_in_ms)
+            or (
+                value is False
+                and last_refetch_time
+                < (
+                    get_timestamp_ms() - self.refetch_time_on_false_in_ms
+                )  # TODO: Default 5 min?
+            )
         )
 
 
 class EmailVerificationClaimValidators(BooleanClaimValidators):
     def is_verified(
-        self, refetch_time_on_false_in_seconds: int = 10
+        self,
+        refetch_time_on_false_in_seconds: int = 10,
+        max_age_in_seconds: int = 300,
     ) -> SessionClaimValidator:
         has_value_res = self.has_value(True, id_="st-ev-is-verified")
         assert isinstance(self.claim, BooleanClaim)
         return IsVerifiedSCV(
-            self.claim, has_value_res, refetch_time_on_false_in_seconds
+            self.claim,
+            has_value_res,
+            refetch_time_on_false_in_seconds,
+            max_age_in_seconds,
         )

supertokens_python/recipe/session/claim_base_classes/primitive_array_claim.py

@@ -100,7 +100,11 @@ async def _validate(
 
         # Doing this to ensure same code in the upcoming steps irrespective of
         # whether self.val is Primitive or PrimitiveList
-        vals: List[JSONPrimitive] = val if isinstance(val, list) else [val]
+        vals: List[JSONPrimitive] = (
+            val if isinstance(val, list) else [val]
+        )  # pyright: reportGeneralTypeIssues=false
+
+        #
 
         claim_val_set = set(claim_val)
         if is_include:
@@ -176,7 +180,7 @@ def __init__(
 
     def includes(  # pyright: ignore[reportInvalidTypeVarUse]
         self,
-        val: Primitive,
+        val: Primitive,  # pyright: ignore[reportInvalidTypeVarUse]
         id_: Union[str, None] = None,
         max_age_in_seconds: Optional[int] = None,
     ) -> SessionClaimValidator:
@@ -187,7 +191,7 @@ def includes(  # pyright: ignore[reportInvalidTypeVarUse]
 
     def excludes(  # pyright: ignore[reportInvalidTypeVarUse]
         self,
-        val: Primitive,
+        val: Primitive,  # pyright: ignore[reportInvalidTypeVarUse]
         id_: Union[str, None] = None,
         max_age_in_seconds: Optional[int] = None,
     ) -> SessionClaimValidator:

supertokens_python/recipe/session/claim_base_classes/primitive_claim.py

@@ -39,14 +39,14 @@ def __init__(
         super().__init__(id_)
         self.claim: SessionClaim[_T] = claim  # Required to fix the type for pyright
         self.val = val
-        self.max_age_in_sec = max_age_in_sec  # TODO: Default 5 min
+        self.max_age_in_sec = max_age_in_sec or 300
 
     def should_refetch(
         self,
         payload: JSONObject,
         user_context: Dict[str, Any],
-    ):
-        max_age_in_sec: int = self.max_age_in_sec
+    ) -> bool:
+        max_age_in_sec = self.max_age_in_sec
 
         # (claim value is None) OR (value has expired)
         return (self.claim.get_value_from_payload(payload, user_context) is None) or (

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

@@ -592,7 +592,7 @@ async def signout_post(
                 "body", api_options.request
             )
             if is_general_error:
-                return GeneralErrorResponse("general error from signout API")
+                raise Exception("general error from signout API")
             return await original_signout_post(api_options, session, user_context)
 
         original_implementation.signout_post = signout_post

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

@@ -644,7 +644,7 @@ async def signout_post(
                 "body", api_options.request
             )
             if is_general_error:
-                return GeneralErrorResponse("general error from signout API")
+                raise Exception("general error from signout API")
             return await original_signout_post(api_options, session, user_context)
 
         original_implementation.signout_post = signout_post

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

@@ -614,7 +614,7 @@ async def signout_post(
                 "body", api_options.request
             )
             if is_general_error:
-                return GeneralErrorResponse("general error from signout API")
+                raise Exception("general error from signout API")
             return await original_signout_post(api_options, session, user_context)
 
         original_implementation.signout_post = signout_post