more fixes

Author: rishabhpoddar

supertokens_python/recipe/session/recipe.py

@@ -60,6 +60,7 @@
     TokenTransferMethod,
     validate_and_normalise_user_input,
 )
+from .cookie_and_header import clear_session_from_all_token_transfer_methods
 
 
 class SessionRecipe(RecipeModule):
@@ -235,13 +236,22 @@ async def handle_error(
 
         if isinstance(err, UnauthorisedError):
             log_debug_message("errorHandler: returning UNAUTHORISED")
+            if err.clear_tokens:
+                log_debug_message("Clearing tokens because of UNAUTHORISED response")
+                clear_session_from_all_token_transfer_methods(
+                    response, self, request, user_context
+                )
             return await self.config.error_handlers.on_unauthorised(
-                self, err.clear_tokens, request, str(err), response, user_context
+                request, str(err), response
             )
         if isinstance(err, TokenTheftError):
             log_debug_message("errorHandler: returning TOKEN_THEFT_DETECTED")
+            log_debug_message("Clearing tokens because of TOKEN_THEFT_DETECTED response")
+            clear_session_from_all_token_transfer_methods(
+                response, self, request, user_context
+            )
             return await self.config.error_handlers.on_token_theft_detected(
-                self, request, err.session_handle, err.user_id, response, user_context
+                request, err.session_handle, err.user_id, response
             )
         if isinstance(err, InvalidClaimsError):
             log_debug_message("errorHandler: returning INVALID_CLAIMS")

supertokens_python/recipe/session/utils.py

@@ -126,17 +126,11 @@ def __init__(
 
     async def on_token_theft_detected(
         self,
-        recipe: SessionRecipe,
         request: BaseRequest,
         session_handle: str,
         user_id: str,
         response: BaseResponse,
-        user_context: Dict[str, Any],
     ) -> BaseResponse:
-        log_debug_message("Clearing tokens because of TOKEN_THEFT_DETECTED response")
-        clear_session_from_all_token_transfer_methods(
-            response, recipe, request, user_context
-        )
         return await resolve(
             self.__on_token_theft_detected(request, session_handle, user_id, response)
         )
@@ -149,18 +143,10 @@ async def on_try_refresh_token(
 
     async def on_unauthorised(
         self,
-        recipe: SessionRecipe,
-        do_clear_cookies: bool,
         request: BaseRequest,
         message: str,
         response: BaseResponse,
-        user_context: Dict[str, Any],
     ):
-        if do_clear_cookies:
-            log_debug_message("Clearing tokens because of UNAUTHORISED response")
-            clear_session_from_all_token_transfer_methods(
-                response, recipe, request, user_context
-            )
         return await resolve(self.__on_unauthorised(request, message, response))
 
     async def on_invalid_claim(