fix: Fix overrides not applying correctly in methods called on SessionContainer

Author: KShivendu

CHANGELOG.md

@@ -1,3 +1,4 @@
+
 # Changelog
 All notable changes to this project will be documented in this file.
 
@@ -6,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Bug fix:
+- Fix overrides not applying correctly in methods called on SessionContainer instances
+
 ## [0.10.2] - 2022-07-14
 ### Bug fix
 - Make `user_context` optional in userroles recipe syncio functions. 

supertokens_python/recipe/session/interfaces.py

@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, Dict, List, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Union, Callable
 
 from supertokens_python.async_to_sync_wrapper import sync
 from supertokens_python.types import APIResponse, GeneralErrorResponse
@@ -219,13 +219,13 @@ async def verify_session(
 class SessionContainer(ABC):
     def __init__(
         self,
-        recipe_implementation: RecipeInterface,
+        get_recipe_impl: Callable[[], RecipeInterface],
         access_token: str,
         session_handle: str,
         user_id: str,
         access_token_payload: Dict[str, Any],
     ):
-        self.recipe_implementation = recipe_implementation
+        self.get_recipe_impl = get_recipe_impl
         self.access_token = access_token
         self.session_handle = session_handle
         self.access_token_payload = access_token_payload

supertokens_python/recipe/session/recipe.py

@@ -115,7 +115,9 @@ def __init__(
                 openid_feature_override,
             )
             recipe_implementation = RecipeImplementation(
-                Querier.get_instance(recipe_id), self.config
+                Querier.get_instance(recipe_id),
+                self.config,
+                lambda: self.recipe_implementation,
             )
             recipe_implementation = get_recipe_implementation_with_jwt(
                 recipe_implementation,
@@ -124,7 +126,9 @@ def __init__(
             )
         else:
             recipe_implementation = RecipeImplementation(
-                Querier.get_instance(recipe_id), self.config
+                Querier.get_instance(recipe_id),
+                self.config,
+                lambda: self.recipe_implementation,
             )
         self.recipe_implementation: RecipeInterface = (
             recipe_implementation

supertokens_python/recipe/session/recipe_implementation.py

@@ -13,7 +13,7 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING, Any, Dict, Callable
 
 from supertokens_python.framework.request import BaseRequest
 from supertokens_python.logger import log_debug_message
@@ -75,11 +75,17 @@ def get_jwt_signing_public_key_list(self) -> List[Dict[str, Any]]:
 
 
 class RecipeImplementation(RecipeInterface):
-    def __init__(self, querier: Querier, config: SessionConfig):
+    def __init__(
+        self,
+        querier: Querier,
+        config: SessionConfig,
+        get_recipe_impl_after_overrides: Callable[[], RecipeInterface],
+    ):
         super().__init__()
         self.querier = querier
         self.config = config
         self.handshake_info: Union[HandshakeInfo, None] = None
+        self.get_recipe_impl = get_recipe_impl_after_overrides
 
         async def call_get_handshake_info():
             try:
@@ -149,7 +155,7 @@ async def create_new_session(
         refresh_token = session["refreshToken"]
         id_refresh_token = session["idRefreshToken"]
         new_session = Session(
-            self,
+            self.get_recipe_impl,
             access_token["token"],
             session["session"]["handle"],
             session["session"]["userId"],
@@ -225,7 +231,7 @@ async def get_session(
         if access_token is None:
             raise Exception("Should never come here")
         session = Session(
-            self,
+            self.get_recipe_impl,
             access_token,
             new_session["session"]["handle"],
             new_session["session"]["userId"],
@@ -271,7 +277,7 @@ async def refresh_session(
         refresh_token = new_session["refreshToken"]
         id_refresh_token = new_session["idRefreshToken"]
         session = Session(
-            self,
+            self.get_recipe_impl,
             access_token["token"],
             new_session["session"]["handle"],
             new_session["session"]["userId"],

supertokens_python/recipe/session/session_class.py

@@ -22,17 +22,15 @@ class Session(SessionContainer):
     async def revoke_session(self, user_context: Union[Any, None] = None) -> None:
         if user_context is None:
             user_context = {}
-        await self.recipe_implementation.revoke_session(
-            self.session_handle, user_context
-        )
+        await self.get_recipe_impl().revoke_session(self.session_handle, user_context)
         self.remove_cookies = True
 
     async def get_session_data(
         self, user_context: Union[Dict[str, Any], None] = None
     ) -> Dict[str, Any]:
         if user_context is None:
             user_context = {}
-        session_info = await self.recipe_implementation.get_session_information(
+        session_info = await self.get_recipe_impl().get_session_information(
             self.session_handle, user_context
         )
         if session_info is None:
@@ -47,7 +45,7 @@ async def update_session_data(
     ) -> None:
         if user_context is None:
             user_context = {}
-        updated = await self.recipe_implementation.update_session_data(
+        updated = await self.get_recipe_impl().update_session_data(
             self.session_handle, new_session_data, user_context
         )
         if not updated:
@@ -60,7 +58,7 @@ async def update_access_token_payload(
     ) -> None:
         if user_context is None:
             user_context = {}
-        response = await self.recipe_implementation.regenerate_access_token(
+        response = await self.get_recipe_impl().regenerate_access_token(
             self.access_token, new_access_token_payload, user_context
         )
         if response is None:
@@ -94,7 +92,7 @@ async def get_time_created(
     ) -> int:
         if user_context is None:
             user_context = {}
-        session_info = await self.recipe_implementation.get_session_information(
+        session_info = await self.get_recipe_impl().get_session_information(
             self.session_handle, user_context
         )
         if session_info is None:
@@ -105,7 +103,7 @@ async def get_time_created(
     async def get_expiry(self, user_context: Union[Dict[str, Any], None] = None) -> int:
         if user_context is None:
             user_context = {}
-        session_info = await self.recipe_implementation.get_session_information(
+        session_info = await self.get_recipe_impl().get_session_information(
             self.session_handle, user_context
         )
         if session_info is None: