Fix comments

Author: vsdudakov

fastadmin/api/service.py

@@ -505,8 +505,9 @@ async def get_configuration(
         session_id: str | None,
         request: Any | None = None,
     ) -> ConfigurationSchema:
-        current_user_id = await get_user_id_from_session_id(session_id)
-        if not current_user_id:
+        try:
+            current_user_id, current_user = await self._get_authenticated_user(session_id)
+        except AdminApiException:
             return ConfigurationSchema(
                 site_name=settings.ADMIN_SITE_NAME,
                 site_sign_in_logo=settings.ADMIN_SITE_SIGN_IN_LOGO,
@@ -521,12 +522,6 @@ async def get_configuration(
                 dashboard_widgets=[],
             )
 
-        admin_user_model = get_admin_model(settings.ADMIN_USER_MODEL)
-        current_user = (
-            await admin_user_model.get_obj(current_user_id)
-            if admin_user_model and hasattr(admin_user_model, "get_obj")
-            else None
-        )
         admin_models = cast(dict[Any, ModelAdmin | InlineModelAdmin], get_admin_models())
         models = cast(
             Sequence[ModelSchema],

fastadmin/models/base.py

@@ -722,6 +722,9 @@ async def save_model(self, id: UUID | int | str | None, payload: dict) -> dict |
 
 
 class DashboardWidgetAdmin:
+    _request_context: ContextVar[Any | None]
+    _user_context: ContextVar[Any | None]
+
     title: str
     dashboard_widget_type: DashboardWidgetType
     x_field: str
@@ -731,6 +734,25 @@ class DashboardWidgetAdmin:
     x_field_filter_widget_props: dict[str, Any] | None = None
     x_field_periods: list[str] | None = None
 
+    def __init__(self) -> None:
+        self._request_context = ContextVar(f"fastadmin_dashboard_request_context_{id(self)}", default=None)
+        self._user_context = ContextVar(f"fastadmin_dashboard_user_context_{id(self)}", default=None)
+
+    @property
+    def request(self) -> Any | None:
+        """Current request object for this async context."""
+        return self._request_context.get()
+
+    @property
+    def user(self) -> Any | None:
+        """Current authenticated user object for this async context."""
+        return self._user_context.get()
+
+    def set_context(self, request: Any | None = None, user: Any | None = None) -> None:
+        """Set request/user context for the current async task."""
+        self._request_context.set(request)
+        self._user_context.set(user)
+
     async def get_data(
         self,
         min_x_field: str | None = None,

tests/api/test_service.py

@@ -68,6 +68,36 @@ def get_data(self, min_x_field=None, max_x_field=None, period_x_field=None):
     assert result["results"] == [{"x": "A", "y": 1}]
 
 
+async def test_dashboard_widget_binds_request_and_user_context(monkeypatch):
+    monkeypatch.setattr("fastadmin.api.service.get_user_id_from_session_id", AsyncMock(return_value=1))
+    current_user = {"id": 1, "username": "admin"}
+    monkeypatch.setattr(
+        "fastadmin.api.service.get_admin_model",
+        lambda _model: SimpleNamespace(get_obj=AsyncMock(return_value=current_user)),
+    )
+
+    class SyncWidget:
+        def __init__(self):
+            self.request = None
+            self.user = None
+
+        def set_context(self, request=None, user=None):
+            self.request = request
+            self.user = user
+
+        def get_data(self, min_x_field=None, max_x_field=None, period_x_field=None):
+            return {"results": [{"x": "A", "y": 1}]}
+
+    widget = SyncWidget()
+    monkeypatch.setitem(admin_dashboard_widgets, "SyncWidgetContext", widget)
+
+    request = object()
+    result = await ApiService().dashboard_widget("sid", "SyncWidgetContext", request=request)
+    assert result["results"] == [{"x": "A", "y": 1}]
+    assert widget.request is request
+    assert widget.user == current_user
+
+
 async def test_list_skips_excluded_filter_fields(monkeypatch):
     monkeypatch.setattr("fastadmin.api.service.get_user_id_from_session_id", AsyncMock(return_value=1))
     admin_model = SimpleNamespace(

tests/models/test_base.py

@@ -66,6 +66,19 @@ class Model:
     assert admin.user == user
 
 
+def test_dashboard_widget_admin_request_and_user_context():
+    widget = DashboardWidgetAdmin()
+    assert widget.request is None
+    assert widget.user is None
+
+    request = {"path": "/api/dashboard-widget/TestWidget"}
+    user = {"id": 1, "username": "admin"}
+    widget.set_context(request=request, user=user)
+
+    assert widget.request == request
+    assert widget.user == user
+
+
 async def test_export_wrong_format(mocker):
     class Model:
         pass