more fixes

Author: rishabhpoddar

supertokens_python/framework/django/django_middleware.py

@@ -49,7 +49,7 @@ async def __asyncMiddleware(request: HttpRequest):
                     request.supertokens, SessionContainer  # type: ignore
                 ):
                     manage_session_post_response(
-                        request.supertokens, result  # type: ignore
+                        request.supertokens, result, user_context # type: ignore
                     )
                 if isinstance(result, DjangoResponse):
                     return result.response
@@ -85,7 +85,7 @@ def __syncMiddleware(request: HttpRequest):
                 request.supertokens, SessionContainer  # type: ignore
             ):
                 manage_session_post_response(
-                    request.supertokens, result  # type: ignore
+                    request.supertokens, result, user_context # type: ignore
                 )
             return result.response
 

supertokens_python/framework/fastapi/fastapi_middleware.py

@@ -59,7 +59,7 @@ async def dispatch(self, request: Request, call_next: RequestResponseEndpoint):
                 if hasattr(request.state, "supertokens") and isinstance(
                     request.state.supertokens, SessionContainer
                 ):
-                    manage_session_post_response(request.state.supertokens, result)
+                    manage_session_post_response(request.state.supertokens, result, user_context)
                 if isinstance(result, FastApiResponse):
                     return result.response
             except SuperTokensError as e:

supertokens_python/framework/flask/flask_middleware.py

@@ -69,7 +69,7 @@ def _(response: Response):
 
             response_ = FlaskResponse(response)
             if hasattr(g, "supertokens") and g.supertokens is not None:
-                manage_session_post_response(g.supertokens, response_)
+                manage_session_post_response(g.supertokens, response_, {})
 
             return response_.response
 

supertokens_python/recipe/session/cookie_and_header.py

@@ -141,10 +141,10 @@ def set_cookie_response_mutator(
     expires: int,
     path_type: Literal["refresh_token_path", "access_token_path"],
     request: BaseRequest,
-    user_context: Dict[str, Any],
 ):
     def mutator(
         response: BaseResponse,
+        user_context: Dict[str, Any],
     ):
         return _set_cookie(
             response, config, key, value, expires, path_type, request, user_context
@@ -161,6 +161,7 @@ def _attach_anti_csrf_header(response: BaseResponse, value: str):
 def anti_csrf_response_mutator(value: str):
     def mutator(
         response: BaseResponse,
+        _: Dict[str, Any],
     ):
         return _attach_anti_csrf_header(response, value)
 
@@ -195,10 +196,10 @@ def clear_session_mutator(
     config: SessionConfig,
     transfer_method: TokenTransferMethod,
     request: BaseRequest,
-    user_context: Dict[str, Any],
 ):
     def mutator(
         response: BaseResponse,
+        user_context: Dict[str, Any],
     ):
         return _clear_session(response, config, transfer_method, request, user_context)
 
@@ -232,10 +233,10 @@ def clear_session_response_mutator(
     config: SessionConfig,
     transfer_method: TokenTransferMethod,
     request: BaseRequest,
-    user_context: Dict[str, Any],
 ):
     def mutator(
         response: BaseResponse,
+        user_context: Dict[str, Any],
     ):
         return _clear_session(response, config, transfer_method, request, user_context)
 
@@ -313,9 +314,8 @@ def token_response_mutator(
     expires: int,
     transfer_method: TokenTransferMethod,
     request: BaseRequest,
-    user_context: Dict[str, Any],
 ):
-    def mutator(response: BaseResponse):
+    def mutator(response: BaseResponse, user_context: Dict[str, Any],):
         _set_token(
             response,
             config,
@@ -341,10 +341,9 @@ def access_token_mutator(
     config: SessionConfig,
     transfer_method: TokenTransferMethod,
     request: BaseRequest,
-    user_context: Dict[str, Any],
 ):
     def mutator(
-        response: BaseResponse,
+        response: BaseResponse, user_context: Dict[str, Any],
     ):
         _set_access_token_in_response(
             response,

supertokens_python/recipe/session/interfaces.py

@@ -378,7 +378,7 @@ async def verify_session(
         pass
 
 
-ResponseMutator = Callable[[BaseResponse], None]
+ResponseMutator = Callable[[BaseResponse, Dict[str, Any]], None]
 
 
 class TokenInfo:

supertokens_python/recipe/session/session_class.py

@@ -38,7 +38,7 @@
 from ...framework import BaseRequest
 from supertokens_python.utils import (
     log_debug_message,
-    set_request_in_user_context_if_not_defined,
+    default_user_context
 )
 
 _T = TypeVar("_T")
@@ -55,15 +55,14 @@ async def attach_to_request_response(
 
         if self.access_token_updated:
             if user_context is None:
-                user_context = set_request_in_user_context_if_not_defined({}, request)
+                user_context = default_user_context(request)
             self.response_mutators.append(
                 access_token_mutator(
                     self.access_token,
                     self.front_token,
                     self.config,
                     transfer_method,
                     request,
-                    user_context,
                 )
             )
             if self.refresh_token is not None:
@@ -75,7 +74,6 @@ async def attach_to_request_response(
                         self.refresh_token.expiry,
                         transfer_method,
                         request,
-                        user_context,
                     )
                 )
             if self.anti_csrf_token is not None:
@@ -108,7 +106,6 @@ async def revoke_session(self, user_context: Union[Any, None] = None) -> None:
                     self.config,
                     transfer_method,
                     self.req_res_info.request,
-                    user_context,
                 )
             )
 
@@ -330,8 +327,7 @@ async def merge_into_access_token_payload(
                         self.front_token,
                         self.config,
                         transfer_method,
-                        self.req_res_info.request,
-                        user_context,
+                        self.req_res_info.request
                     )
                 )
         else:

supertokens_python/supertokens.py

@@ -192,10 +192,10 @@ def defaultImpl(o: Any):
         return json.dumps(self, default=defaultImpl, sort_keys=True, indent=4)
 
 
-def manage_session_post_response(session: SessionContainer, response: BaseResponse):
+def manage_session_post_response(session: SessionContainer, response: BaseResponse, user_context: Dict[str, Any]):
     # Something similar happens in handle_error of session/recipe.py
     for mutator in session.response_mutators:
-        mutator(response=response)  # type: ignore
+        mutator(response, user_context)
 
 
 class Supertokens: