diff --git a/api/controllers/common/agent_access.py b/api/controllers/common/agent_access.py new file mode 100644 index 00000000000..1f2df6dfb47 --- /dev/null +++ b/api/controllers/common/agent_access.py @@ -0,0 +1,85 @@ +from __future__ import annotations + +from collections.abc import Sequence +from dataclasses import dataclass +from typing import TYPE_CHECKING + +from sqlalchemy.orm import Session + +from services.agent.roster_service import AgentRosterService +from services.enterprise import rbac_service as enterprise_rbac_service + +if TYPE_CHECKING: + from services.app_service import AppListBaseParams + from services.enterprise.rbac_service import MyPermissionsResponse + + +AGENT_LIST_PERMISSION_KEYS: frozenset[str] = frozenset({"agent.acl.preview"}) + + +def has_agent_list_permission(permission_keys: Sequence[str]) -> bool: + """Return whether the permission set makes an Agent visible in resource lists.""" + return any(permission_key in AGENT_LIST_PERMISSION_KEYS for permission_key in permission_keys) + + +@dataclass(frozen=True) +class AgentAccessFilter: + """Resolved resource-level visibility for Agent list endpoints. + + ``accessible_agent_ids`` of ``None`` means every Agent is visible. An + explicit set limits list queries to exactly those Agent resources. + """ + + accessible_agent_ids: set[str] | None + + @classmethod + def unrestricted(cls) -> AgentAccessFilter: + return cls(accessible_agent_ids=None) + + def apply_to_app_params(self, params: AppListBaseParams, *, tenant_id: str, session: Session) -> None: + """Translate visible Agent ids to their Agent App ids before pagination.""" + if self.accessible_agent_ids is None: + return + if not self.accessible_agent_ids: + params.accessible_app_ids = [] + return + + params.accessible_app_ids = AgentRosterService(session).load_app_ids_for_agents( + tenant_id=tenant_id, + agent_ids=sorted(self.accessible_agent_ids), + ) + + +def resolve_agent_access_filter( + tenant_id: str, + account_id: str, + *, + session: Session, + permissions: MyPermissionsResponse | None = None, +) -> AgentAccessFilter: + """Compute Agent resources visible to an account in a workspace.""" + if permissions is None: + permissions = enterprise_rbac_service.RBACService.MyPermissions.get( + tenant_id, + account_id, + session=session, + ) + whitelist_scope = enterprise_rbac_service.RBACService.AgentAccess.whitelist_resources(tenant_id, account_id) + has_default_preview = has_agent_list_permission( + permissions.agent.default_permission_keys + ) or has_agent_list_permission(permissions.workspace.permission_keys) + + permission_agent_ids: set[str] | None = None + if not has_default_preview: + permission_agent_ids = { + override.resource_id + for override in permissions.agent.overrides + if has_agent_list_permission(override.permission_keys) + } + + if whitelist_scope.unrestricted: + accessible_agent_ids = permission_agent_ids + else: + accessible_agent_ids = set(whitelist_scope.resource_ids) + + return AgentAccessFilter(accessible_agent_ids=accessible_agent_ids) diff --git a/api/controllers/console/agent/roster.py b/api/controllers/console/agent/roster.py index a8ba32477af..5811d0c54fb 100644 --- a/api/controllers/console/agent/roster.py +++ b/api/controllers/console/agent/roster.py @@ -7,6 +7,8 @@ from pydantic import AliasChoices, BaseModel, Field, field_validator from sqlalchemy import func, or_, select from sqlalchemy.orm import Session +from configs import dify_config +from controllers.common.agent_access import resolve_agent_access_filter from controllers.common.rbac import AgentId, RBACCheck, Workspace from controllers.common.schema import ( query_params_from_model, @@ -78,6 +80,7 @@ from services.agent.observability_service import ( ) from services.agent.roster_service import AgentRosterService from services.app_service import AgentAppPublicationCounts, AppListParams, AppService, CreateAppParams +from services.enterprise import rbac_service as enterprise_rbac_service from services.enterprise.enterprise_service import EnterpriseService from services.entities.agent_entities import ComposerSavePayload, RosterListQuery from services.system_feature_service import SystemFeatureService @@ -251,6 +254,7 @@ class AgentStatisticsQuery(BaseModel): class AgentAppPartial(GenericAppPartial): + permission_keys: list[str] app_id: str | None = None backing_app_id: str | None = None hidden_app_backed: bool = False @@ -263,6 +267,7 @@ class AgentAppPartial(GenericAppPartial): class AgentAppDetailWithSite(GenericAppDetailWithSite): + permission_keys: list[str] app_id: str | None = None backing_app_id: str | None = None hidden_app_backed: bool = False @@ -392,7 +397,7 @@ def _serialize_agent_app_detail( app_model.access_mode = app_setting.access_mode # type: ignore[attr-defined] roster_service = _agent_roster_service(session) - payload = AgentAppDetailWithSite.model_validate( + payload = GenericAppDetailWithSite.model_validate( app_model, from_attributes=True, context={"session": session}, @@ -429,7 +434,14 @@ def _serialize_agent_app_detail( payload["debug_conversation_message_count"] = message_count payload["role"] = agent.role or "" payload["access_ready"] = agent_has_workflow_callable_active_snapshot(session=session, agent=agent) - return payload + permissions = enterprise_rbac_service.RBACService.MyPermissions.get( + app_model.tenant_id, + current_user.id, + agent_id=agent.id, + session=session, + ) + payload["permission_keys"] = permissions.agent.permission_keys_by_resource_ids([agent.id]).get(agent.id, []) + return AgentAppDetailWithSite.model_validate(payload).model_dump(mode="json", exclude={"bound_agent_id"}) def _serialize_agent_app_pagination( @@ -439,6 +451,7 @@ def _serialize_agent_app_pagination( tenant_id: str, current_user: Account, publication_counts: AgentAppPublicationCounts, + agent_permissions: enterprise_rbac_service.ResourcePermissionSnapshot, ) -> dict: """Serialize Agent App lists with roster-shaped items. @@ -471,20 +484,23 @@ def _serialize_agent_app_pagination( agents=list(agents_by_app_id.values()), account_id=current_user.id, ) - payload = AgentAppPagination.model_validate( + permission_keys_by_agent_id = agent_permissions.permission_keys_by_resource_ids( + [agent.id for agent in agents_by_app_id.values()] + ) + payload = GenericAppPagination.model_validate( { "page": app_pagination.page, "limit": app_pagination.per_page, "total": app_pagination.total, "has_more": app_pagination.has_next, "data": app_pagination.items, - "publication_counts": { - "published": publication_counts.published, - "drafts": publication_counts.drafts, - }, }, context={"session": session}, ).model_dump(mode="json") + payload["publication_counts"] = { + "published": publication_counts.published, + "drafts": publication_counts.drafts, + } for item in payload["data"]: app_id = item["id"] item.pop("bound_agent_id", None) @@ -495,6 +511,7 @@ def _serialize_agent_app_pagination( item["hidden_app_backed"] = False item["id"] = agent.id item["debug_conversation_id"] = debug_conversation_ids_by_agent_id.get(agent.id) + item["permission_keys"] = permission_keys_by_agent_id.get(agent.id, []) item["role"] = agent.role or "" item["active_config_is_published"] = active_config_is_published_by_agent_id.get(agent.id, False) item["reference_count"] = reference_counts_by_agent_id.get(agent.id, 0) @@ -607,7 +624,6 @@ class AgentAppListApi(Resource): @setup_required @login_required @account_initialization_required - @rbac_permission_required(RBACCheck(RBACPermission.AGENT_PREVIEW, Workspace())) @with_current_user @with_current_tenant_id @with_session @@ -628,6 +644,20 @@ class AgentAppListApi(Resource): agent_is_published=agent_is_published, ) + permissions = enterprise_rbac_service.RBACService.MyPermissions.get( + current_tenant_id, + current_user.id, + session=session, + ) + if dify_config.RBAC_ENABLED: + access_filter = resolve_agent_access_filter( + current_tenant_id, + current_user.id, + session=session, + permissions=permissions, + ) + access_filter.apply_to_app_params(params, tenant_id=current_tenant_id, session=session) + app_service = AppService() publication_counts = app_service.get_agent_publication_counts( current_user.id, @@ -656,6 +686,7 @@ class AgentAppListApi(Resource): tenant_id=current_tenant_id, current_user=current_user, publication_counts=publication_counts, + agent_permissions=permissions.agent, ) @console_ns.expect(console_ns.models[AgentAppCreatePayload.__name__]) @@ -1059,11 +1090,33 @@ class AgentInviteOptionsApi(Resource): @setup_required @login_required @account_initialization_required - @rbac_permission_required(RBACCheck(RBACPermission.AGENT_PREVIEW, Workspace())) + @with_current_user @with_current_tenant_id @with_session(write=False) @model_validate(AgentInviteOptionsQuery) - def get(self, req_data: AgentInviteOptionsQuery, session: Session, tenant_id: str): + def get( + self, + req_data: AgentInviteOptionsQuery, + session: Session, + tenant_id: str, + current_user: Account, + ): + accessible_agent_ids = None + if dify_config.RBAC_ENABLED: + permissions = enterprise_rbac_service.RBACService.MyPermissions.get( + tenant_id, + current_user.id, + session=session, + ) + access_filter = resolve_agent_access_filter( + tenant_id, + current_user.id, + session=session, + permissions=permissions, + ) + if access_filter.accessible_agent_ids is not None: + accessible_agent_ids = sorted(access_filter.accessible_agent_ids) + return dump_response( AgentInviteOptionsResponse, _agent_roster_service(session).list_invite_options( @@ -1072,6 +1125,7 @@ class AgentInviteOptionsApi(Resource): limit=req_data.limit, keyword=req_data.keyword, app_id=req_data.app_id, + accessible_agent_ids=accessible_agent_ids, ), ) diff --git a/api/controllers/console/workspace/rbac.py b/api/controllers/console/workspace/rbac.py index 9a036af6122..1ef222fbe81 100644 --- a/api/controllers/console/workspace/rbac.py +++ b/api/controllers/console/workspace/rbac.py @@ -401,6 +401,9 @@ class _AccessPolicyUpdateRequest(BaseModel): permission_keys: list[str] = [] +register_schema_models(console_ns, _AccessPolicyCreateRequest, _AccessPolicyUpdateRequest) + + @console_ns.route("/workspaces/current/rbac/access-policies") class RBACAccessPoliciesApi(Resource): @login_required @@ -420,9 +423,10 @@ class RBACAccessPoliciesApi(Resource): ) ) + @console_ns.expect(console_ns.models[_AccessPolicyCreateRequest.__name__]) + @console_ns.response(201, "Policy created", console_ns.models[svc.AccessPolicy.__name__]) @login_required @rbac_permission_required(RBACCheck(RBACPermission.WORKSPACE_ROLE_MANAGE, Workspace())) - @console_ns.response(201, "Policy created", console_ns.models[svc.AccessPolicy.__name__]) def post(self): tenant_id, account_id = _current_ids() request = _payload(_AccessPolicyCreateRequest) @@ -448,9 +452,10 @@ class RBACAccessPolicyItemApi(Resource): tenant_id, account_id = _current_ids() return _dump(svc.RBACService.AccessPolicies.get(tenant_id, account_id, str(policy_id))) + @console_ns.expect(console_ns.models[_AccessPolicyUpdateRequest.__name__]) + @console_ns.response(200, "Success", console_ns.models[svc.AccessPolicy.__name__]) @login_required @rbac_permission_required(RBACCheck(RBACPermission.WORKSPACE_ROLE_MANAGE, Workspace())) - @console_ns.response(200, "Success", console_ns.models[svc.AccessPolicy.__name__]) def put(self, policy_id): tenant_id, account_id = _current_ids() request = _payload(_AccessPolicyUpdateRequest) diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.md index c60f5a5d8a6..216419ee6f2 100644 --- a/api/openapi/markdown/console-openapi.md +++ b/api/openapi/markdown/console-openapi.md @@ -11148,11 +11148,17 @@ Returns permission flags that control workspace features like member invitations | 200 | Success | ### [POST] /workspaces/current/rbac/access-policies +#### Request Body + +| Required | Schema | +| -------- | ------ | +| Yes | **application/json**: [_AccessPolicyCreateRequest](#_accesspolicycreaterequest)
| + #### Responses -| Code | Description | -| ---- | ----------- | -| 200 | Success | +| Code | Description | Schema | +| ---- | ----------- | ------ | +| 201 | Policy created | **application/json**: [AccessPolicy](#accesspolicy)
| ### [DELETE] /workspaces/current/rbac/access-policies/{policy_id} #### Parameters @@ -11187,11 +11193,17 @@ Returns permission flags that control workspace features like member invitations | ---- | ---------- | ----------- | -------- | ------ | | policy_id | path | | Yes | string (uuid) | +#### Request Body + +| Required | Schema | +| -------- | ------ | +| Yes | **application/json**: [_AccessPolicyUpdateRequest](#_accesspolicyupdaterequest)
| + #### Responses -| Code | Description | -| ---- | ----------- | -| 200 | Success | +| Code | Description | Schema | +| ---- | ----------- | ------ | +| 200 | Success | **application/json**: [AccessPolicy](#accesspolicy)
| ### [POST] /workspaces/current/rbac/access-policies/{policy_id}/copy #### Parameters @@ -13690,7 +13702,7 @@ Model class for AI model. | mode | string | | Yes | | model_config | [AppModelConfigResponse](#appmodelconfigresponse) | | No | | name | string | | Yes | -| permission_keys | [ string ] | | No | +| permission_keys | [ string ] | | Yes | | role | string | | No | | site | [AppDetailSiteResponse](#appdetailsiteresponse) | | No | | tags | [ [Tag](#tag) ] | | No | @@ -13770,7 +13782,7 @@ default (the config form sends the full desired feature state on save). | mode | string | | Yes | | model_config | [ModelConfigPartial](#modelconfigpartial) | | No | | name | string | | Yes | -| permission_keys | [ string ] | | No | +| permission_keys | [ string ] | | Yes | | published_reference_count | integer | | No | | published_references | [ [AgentAppPublishedReferenceResponse](#agentapppublishedreferenceresponse) ] | | No | | reference_count | integer | | No | @@ -21365,6 +21377,14 @@ Model class for provider quota configuration. | ---- | ---- | ----------- | -------- | | QuotaUnit | string | | | +#### RBACResourceType + +Resource types understood by access policies. + +| Name | Type | Description | Required | +| ---- | ---- | ----------- | -------- | +| RBACResourceType | string | Resource types understood by access policies. | | + #### RBACRole | Name | Type | Description | Required | @@ -25143,6 +25163,15 @@ Workflow tool configuration | ---- | ---- | ----------- | -------- | | language | string,
**Available values:** "en", "ja", "zh" | Localized policy label language | No | +#### _AccessPolicyCreateRequest + +| Name | Type | Description | Required | +| ---- | ---- | ----------- | -------- | +| description | string | | No | +| name | string | | Yes | +| permission_keys | [ string ],
**Default:** | | No | +| resource_type | [RBACResourceType](#rbacresourcetype) | | Yes | + #### _AccessPolicyList | Name | Type | Description | Required | @@ -25150,6 +25179,14 @@ Workflow tool configuration | data | [ [AccessPolicy](#accesspolicy) ] | | No | | pagination | [Pagination](#pagination) | | No | +#### _AccessPolicyUpdateRequest + +| Name | Type | Description | Required | +| ---- | ---- | ----------- | -------- | +| description | string | | No | +| name | string | | Yes | +| permission_keys | [ string ],
**Default:** | | No | + #### _DeleteMemberBindingsRequest | Name | Type | Description | Required | diff --git a/api/services/agent/roster_service.py b/api/services/agent/roster_service.py index e781feb169e..cb090cd7d7a 100644 --- a/api/services/agent/roster_service.py +++ b/api/services/agent/roster_service.py @@ -1,4 +1,5 @@ import logging +from collections.abc import Sequence from typing import Any, TypedDict from sqlalchemy import and_, func, or_, select @@ -226,7 +227,14 @@ class AgentRosterService: } def list_invite_options( - self, *, tenant_id: str, page: int = 1, limit: int = 20, keyword: str | None = None, app_id: str | None = None + self, + *, + tenant_id: str, + page: int = 1, + limit: int = 20, + keyword: str | None = None, + app_id: str | None = None, + accessible_agent_ids: Sequence[str] | None = None, ) -> dict[str, Any]: """List active roster Agents whose published snapshot can be called by Workflow.""" @@ -234,6 +242,8 @@ class AgentRosterService: Agent.active_config_has_model.is_(True), workflow_callable_active_snapshot_filter(), ) + if accessible_agent_ids is not None: + stmt = stmt.where(Agent.id.in_(accessible_agent_ids)) total = self._session.scalar(select(func.count()).select_from(stmt.subquery())) or 0 agents = list(self._session.scalars(stmt.offset((page - 1) * limit).limit(limit)).all()) versions_by_id = self._load_versions_by_id( @@ -912,6 +922,22 @@ class AgentRosterService: ).all() return {agent.app_id: agent for agent in agents if agent.app_id and agent.id} + def load_app_ids_for_agents(self, *, tenant_id: str, agent_ids: Sequence[str]) -> list[str]: + """Return active Agent App ids for the requested roster Agents.""" + if not agent_ids: + return [] + app_ids = self._session.scalars( + select(Agent.app_id).where( + Agent.tenant_id == tenant_id, + Agent.id.in_(agent_ids), + Agent.app_id.is_not(None), + Agent.scope == AgentScope.ROSTER, + Agent.source.in_(APP_BACKED_AGENT_SOURCES), + Agent.status == AgentStatus.ACTIVE, + ) + ).all() + return sorted({str(app_id) for app_id in app_ids if app_id}) + def get_app_backing_agent(self, *, tenant_id: str, app_id: str) -> Agent | None: """Return the roster Agent that backs the given Agent App, if any.""" return self._session.scalar( diff --git a/api/tests/unit_tests/controllers/common/test_agent_access.py b/api/tests/unit_tests/controllers/common/test_agent_access.py new file mode 100644 index 00000000000..33857fe03af --- /dev/null +++ b/api/tests/unit_tests/controllers/common/test_agent_access.py @@ -0,0 +1,180 @@ +"""Unit tests for Agent resource-list RBAC filtering.""" + +from __future__ import annotations + +import pytest +from sqlalchemy.orm import Session + +from controllers.common.agent_access import ( + AGENT_LIST_PERMISSION_KEYS, + AgentAccessFilter, + has_agent_list_permission, + resolve_agent_access_filter, +) +from models.agent import Agent, AgentKind, AgentScope, AgentSource, AgentStatus +from services.app_service import AppListParams +from services.enterprise.rbac_service import ( + MyPermissionsResponse, + ResourcePermissionKeys, + ResourcePermissionSnapshot, + ResourceWhitelistResources, + WorkspacePermissionSnapshot, +) + +_RBAC_MODULE = "controllers.common.agent_access.enterprise_rbac_service" + + +def _permissions( + *, + workspace_keys: list[str] | None = None, + agent_default_keys: list[str] | None = None, + agent_overrides: list[ResourcePermissionKeys] | None = None, +) -> MyPermissionsResponse: + return MyPermissionsResponse( + workspace=WorkspacePermissionSnapshot(permission_keys=workspace_keys or []), + agent=ResourcePermissionSnapshot( + default_permission_keys=agent_default_keys or [], + overrides=agent_overrides or [], + ), + ) + + +def _agent( + *, + agent_id: str, + app_id: str | None, + source: AgentSource = AgentSource.AGENT_APP, + status: AgentStatus = AgentStatus.ACTIVE, +) -> Agent: + return Agent( + id=agent_id, + tenant_id="tenant-1", + name=agent_id, + description="", + role="", + agent_kind=AgentKind.DIFY_AGENT, + scope=AgentScope.ROSTER, + source=source, + app_id=app_id, + status=status, + created_by="account-1", + updated_by="account-1", + ) + + +class TestHasAgentListPermission: + def test_matches_preview_permission(self) -> None: + for key in AGENT_LIST_PERMISSION_KEYS: + assert has_agent_list_permission([key]) + + def test_rejects_non_preview_permissions(self) -> None: + assert not has_agent_list_permission(["agent.acl.edit", "agent.acl.delete"]) + assert not has_agent_list_permission([]) + + +class TestAgentAccessFilter: + def test_unrestricted_leaves_app_params_untouched(self, unbound_session: Session) -> None: + params = AppListParams(mode="agent") + + AgentAccessFilter.unrestricted().apply_to_app_params( + params, + tenant_id="tenant-1", + session=unbound_session, + ) + + assert params.accessible_app_ids is None + + def test_maps_visible_agent_ids_to_active_agent_apps(self, sqlite_session: Session) -> None: + sqlite_session.add_all( + [ + _agent(agent_id="agent-1", app_id="app-2"), + _agent(agent_id="agent-2", app_id="app-1"), + _agent(agent_id="agent-3", app_id="workflow-app", source=AgentSource.ROSTER), + _agent(agent_id="agent-4", app_id="archived-app", status=AgentStatus.ARCHIVED), + ] + ) + sqlite_session.flush() + params = AppListParams(mode="agent") + + AgentAccessFilter(accessible_agent_ids={"agent-1", "agent-2", "agent-3", "agent-4"}).apply_to_app_params( + params, tenant_id="tenant-1", session=sqlite_session + ) + + assert params.accessible_app_ids == ["app-1", "app-2"] + + def test_empty_visible_set_filters_every_agent_app(self, unbound_session: Session) -> None: + params = AppListParams(mode="agent") + + AgentAccessFilter(accessible_agent_ids=set()).apply_to_app_params( + params, + tenant_id="tenant-1", + session=unbound_session, + ) + + assert params.accessible_app_ids == [] + + +class TestResolveAgentAccessFilter: + def _patch_whitelist(self, monkeypatch: pytest.MonkeyPatch, whitelist: ResourceWhitelistResources) -> None: + monkeypatch.setattr( + f"{_RBAC_MODULE}.RBACService.AgentAccess.whitelist_resources", + lambda _tenant_id, _account_id: whitelist, + ) + + def test_default_preview_is_unrestricted(self, monkeypatch: pytest.MonkeyPatch, unbound_session: Session) -> None: + self._patch_whitelist(monkeypatch, ResourceWhitelistResources(unrestricted=True)) + + access_filter = resolve_agent_access_filter( + "tenant-1", + "account-1", + session=unbound_session, + permissions=_permissions(agent_default_keys=["agent.acl.preview"]), + ) + + assert access_filter.accessible_agent_ids is None + + def test_collects_preview_overrides_without_default_preview( + self, + monkeypatch: pytest.MonkeyPatch, + unbound_session: Session, + ) -> None: + self._patch_whitelist(monkeypatch, ResourceWhitelistResources(unrestricted=True)) + + access_filter = resolve_agent_access_filter( + "tenant-1", + "account-1", + session=unbound_session, + permissions=_permissions( + agent_overrides=[ + ResourcePermissionKeys( + resource_id="agent-1", + permission_keys=["agent.acl.preview"], + ), + ResourcePermissionKeys( + resource_id="agent-2", + permission_keys=["agent.acl.edit"], + ), + ] + ), + ) + + assert access_filter.accessible_agent_ids == {"agent-1"} + + def test_restricted_whitelist_is_the_visibility_boundary( + self, + monkeypatch: pytest.MonkeyPatch, + unbound_session: Session, + ) -> None: + self._patch_whitelist( + monkeypatch, + ResourceWhitelistResources(unrestricted=False, resource_ids=["agent-9"]), + ) + + access_filter = resolve_agent_access_filter( + "tenant-1", + "account-1", + session=unbound_session, + permissions=_permissions(workspace_keys=["agent.acl.preview"]), + ) + + assert access_filter.accessible_agent_ids == {"agent-9"} diff --git a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py index 17397b0076b..f6c832957fb 100644 --- a/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py +++ b/api/tests/unit_tests/controllers/console/agent/test_agent_controllers.py @@ -302,6 +302,16 @@ def test_agent_app_write_routes_do_not_reuse_app_billing_quota() -> None: assert '@cloud_edition_billing_resource_check("apps")' not in getsource(route_class) +def test_agent_list_reads_do_not_require_workspace_preview() -> None: + for route_class in (AgentAppListApi, AgentInviteOptionsApi): + assert "RBACPermission.AGENT_PREVIEW, Workspace()" not in getsource(route_class.get) + + +def test_agent_app_permission_keys_are_required_response_fields() -> None: + assert roster_controller.AgentAppPartial.model_fields["permission_keys"].is_required() + assert roster_controller.AgentAppDetailWithSite.model_fields["permission_keys"].is_required() + + @pytest.fixture def account_id() -> str: return "account-1" @@ -311,6 +321,33 @@ def test_agent_app_list_and_create_use_agent_route( app: Flask, monkeypatch: pytest.MonkeyPatch, account_id: str, sqlite_session: Session ) -> None: captured: dict[str, object] = {} + permissions = roster_controller.enterprise_rbac_service.MyPermissionsResponse( + agent=roster_controller.enterprise_rbac_service.ResourcePermissionSnapshot( + overrides=[ + roster_controller.enterprise_rbac_service.ResourcePermissionKeys( + resource_id="agent-list", + permission_keys=["agent.acl.preview"], + ) + ] + ) + ) + + class FakeAgentAccessFilter: + def apply_to_app_params(self, params, *, tenant_id: str, session: object) -> None: + captured["access_filter"] = {"tenant_id": tenant_id, "session": session} + params.accessible_app_ids = ["app-list"] + + monkeypatch.setattr( + roster_controller.enterprise_rbac_service.RBACService.MyPermissions, + "get", + lambda *_args, **_kwargs: permissions, + ) + monkeypatch.setattr( + roster_controller, + "resolve_agent_access_filter", + lambda *_args, **_kwargs: FakeAgentAccessFilter(), + ) + apply_config_overrides(monkeypatch, RBAC_ENABLED=True) class FakeAppService: def get_app(self, app_obj: object, *, session: object) -> object: @@ -427,6 +464,7 @@ def test_agent_app_list_and_create_use_agent_route( assert listed["data"][0]["id"] == "agent-list" assert listed["data"][0]["app_id"] == "app-list" assert listed["data"][0]["debug_conversation_id"] == "debug-conversation-list" + assert listed["data"][0]["permission_keys"] == ["agent.acl.preview"] assert listed["data"][0]["role"] == "List role" assert listed["data"][0]["active_config_is_published"] is False assert listed["data"][0]["reference_count"] == 2 @@ -448,6 +486,8 @@ def test_agent_app_list_and_create_use_agent_route( assert list_params.is_created_by_me is True assert list_params.agent_is_published is True assert list_params.status == "normal" + assert list_params.accessible_app_ids == ["app-list"] + assert captured["access_filter"] == {"tenant_id": "tenant-1", "session": sqlite_session} count_call = cast(dict[str, object], captured["counts"]) count_params = cast(Any, count_call["params"]) assert count_params.agent_is_published is True @@ -574,6 +614,15 @@ def test_agent_app_detail_update_delete_resolve_app_from_agent_id( "agent_has_workflow_callable_active_snapshot", lambda **_kwargs: False, ) + monkeypatch.setattr( + roster_controller.enterprise_rbac_service.RBACService.MyPermissions, + "get", + lambda *_args, **_kwargs: roster_controller.enterprise_rbac_service.MyPermissionsResponse( + agent=roster_controller.enterprise_rbac_service.ResourcePermissionSnapshot( + default_permission_keys=["agent.acl.preview"] + ) + ), + ) class FakeAppService: def get_app(self, app_obj: object, *, session: object) -> object: @@ -597,6 +646,7 @@ def test_agent_app_detail_update_delete_resolve_app_from_agent_id( assert detail["debug_conversation_has_messages"] is True assert detail["debug_conversation_message_count"] == 2 assert detail["role"] == "Resolved role" + assert detail["permission_keys"] == ["agent.acl.preview"] assert detail["access_ready"] is False assert "active_config_is_published" not in detail assert "bound_agent_id" not in detail @@ -1066,10 +1116,59 @@ def test_invite_options_get_parses_app_id(app: Flask, monkeypatch: pytest.Monkey monkeypatch.setattr(roster_controller.AgentRosterService, "list_invite_options", list_invite_options) with app.test_request_context("/console/api/agent/invite-options?page=1&limit=10&app_id=app-1"): result = unwrap(AgentInviteOptionsApi.get)( - AgentInviteOptionsApi(), AgentInviteOptionsQuery(page=1, limit=10, app_id="app-1"), MagicMock(), "tenant-1" + AgentInviteOptionsApi(), + AgentInviteOptionsQuery(page=1, limit=10, app_id="app-1"), + MagicMock(), + "tenant-1", + _account(), ) assert result == {"data": [], "page": 1, "limit": 10, "total": 0, "has_more": False} - assert captured == {"tenant_id": "tenant-1", "page": 1, "limit": 10, "keyword": None, "app_id": "app-1"} + assert captured == { + "tenant_id": "tenant-1", + "page": 1, + "limit": 10, + "keyword": None, + "app_id": "app-1", + "accessible_agent_ids": None, + } + + +def test_invite_options_get_applies_resource_visibility( + app: Flask, + monkeypatch: pytest.MonkeyPatch, +) -> None: + captured: dict[str, object] = {} + permissions = roster_controller.enterprise_rbac_service.MyPermissionsResponse() + + monkeypatch.setattr( + roster_controller.enterprise_rbac_service.RBACService.MyPermissions, + "get", + lambda *_args, **_kwargs: permissions, + ) + monkeypatch.setattr( + roster_controller, + "resolve_agent_access_filter", + lambda *_args, **_kwargs: SimpleNamespace(accessible_agent_ids={"agent-2", "agent-1"}), + ) + monkeypatch.setattr( + roster_controller.AgentRosterService, + "list_invite_options", + lambda _self, **kwargs: ( + captured.update(kwargs) or {"data": [], "page": 1, "limit": 10, "total": 0, "has_more": False} + ), + ) + apply_config_overrides(monkeypatch, RBAC_ENABLED=True) + + with app.test_request_context("/console/api/agent/invite-options?page=1&limit=10"): + unwrap(AgentInviteOptionsApi.get)( + AgentInviteOptionsApi(), + AgentInviteOptionsQuery(page=1, limit=10), + MagicMock(), + "tenant-1", + _account(), + ) + + assert captured["accessible_agent_ids"] == ["agent-1", "agent-2"] def test_agent_versions_call_services(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None: diff --git a/api/tests/unit_tests/controllers/test_rbac_access_policy_schema.py b/api/tests/unit_tests/controllers/test_rbac_access_policy_schema.py new file mode 100644 index 00000000000..5bde17c71e7 --- /dev/null +++ b/api/tests/unit_tests/controllers/test_rbac_access_policy_schema.py @@ -0,0 +1,47 @@ +"""Access-policy writes must expose typed bodies through the RBAC decorators.""" + +import json +from typing import cast + +import pytest + + +def _object_at(root: dict[str, object], *keys: str) -> dict[str, object]: + current: object = root + for key in keys: + assert isinstance(current, dict) + current = current[key] + assert isinstance(current, dict) + return cast(dict[str, object], current) + + +@pytest.fixture(scope="module") +def console_schema(tmp_path_factory: pytest.TempPathFactory) -> dict[str, object]: + from dev.generate_swagger_specs import generate_specs + + output_dir = tmp_path_factory.mktemp("rbac-openapi") + generate_specs(output_dir) + schema: object = json.loads((output_dir / "console-openapi.json").read_text()) + assert isinstance(schema, dict) + return cast(dict[str, object], schema) + + +@pytest.mark.parametrize( + ("method", "path", "model", "status"), + [ + ("post", "/workspaces/current/rbac/access-policies", "_AccessPolicyCreateRequest", "201"), + ("put", "/workspaces/current/rbac/access-policies/{policy_id}", "_AccessPolicyUpdateRequest", "200"), + ], +) +def test_access_policy_write_contracts( + console_schema: dict[str, object], method: str, path: str, model: str, status: str +) -> None: + operation = _object_at(console_schema, "paths", path, method) + request_body = _object_at(operation, "requestBody", "content", "application/json", "schema") + assert request_body["$ref"] == f"#/components/schemas/{model}" + + properties = _object_at(console_schema, "components", "schemas", model, "properties") + assert {"name", "description", "permission_keys"} <= properties.keys() + assert _object_at(properties, "permission_keys", "items")["type"] == "string" + response = _object_at(operation, "responses", status, "content", "application/json", "schema") + assert response["$ref"] == "#/components/schemas/AccessPolicy" diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json index 7916faa27cd..32b771f1555 100644 --- a/oxlint-suppressions.json +++ b/oxlint-suppressions.json @@ -2721,14 +2721,6 @@ "count": 2 } }, - "web/app/components/header/account-setting/permission-group-list.tsx": { - "jsx-a11y/click-events-have-key-events": { - "count": 1 - }, - "jsx-a11y/no-static-element-interactions": { - "count": 1 - } - }, "web/app/components/header/github-star/index.tsx": { "@tanstack/query/prefer-query-options": { "count": 1 @@ -5457,14 +5449,6 @@ "count": 1 } }, - "web/service/access-control/use-workspace-access-rules.ts": { - "@tanstack/query/prefer-query-options": { - "count": 2 - }, - "no-restricted-imports": { - "count": 1 - } - }, "web/service/access-control/use-workspace-roles.ts": { "@tanstack/query/prefer-query-options": { "count": 6 diff --git a/packages/contracts/generated/api/console/agent/types.gen.ts b/packages/contracts/generated/api/console/agent/types.gen.ts index 7b9014a58e5..83680198b6b 100644 --- a/packages/contracts/generated/api/console/agent/types.gen.ts +++ b/packages/contracts/generated/api/console/agent/types.gen.ts @@ -49,7 +49,7 @@ export type AgentAppDetailWithSite = { mode: string model_config?: AppModelConfigResponse | null name: string - permission_keys?: Array + permission_keys: Array role?: string | null site?: AppDetailSiteResponse | null tags?: Array @@ -457,7 +457,7 @@ export type AgentAppPartial = { mode: string model_config?: ModelConfigPartial | null name: string - permission_keys?: Array + permission_keys: Array published_reference_count?: number published_references?: Array reference_count?: number | null @@ -1770,7 +1770,7 @@ export type AgentAppDetailWithSiteWritable = { mode: string model_config?: AppModelConfigResponse | null name: string - permission_keys?: Array + permission_keys: Array role?: string | null site?: AppDetailSiteResponseWritable | null tags?: Array @@ -1805,7 +1805,7 @@ export type AgentAppPartialWritable = { mode: string model_config?: ModelConfigPartial | null name: string - permission_keys?: Array + permission_keys: Array published_reference_count?: number published_references?: Array reference_count?: number | null diff --git a/packages/contracts/generated/api/console/agent/zod.gen.ts b/packages/contracts/generated/api/console/agent/zod.gen.ts index 77c929cd007..87f89cb82ac 100644 --- a/packages/contracts/generated/api/console/agent/zod.gen.ts +++ b/packages/contracts/generated/api/console/agent/zod.gen.ts @@ -376,7 +376,7 @@ export const zAgentAppDetailWithSite = z.object({ mode: z.string(), model_config: zAppModelConfigResponse.nullish(), name: z.string(), - permission_keys: z.array(z.string()).optional(), + permission_keys: z.array(z.string()), role: z.string().nullish(), site: zAppDetailSiteResponse.nullish(), tags: z.array(zTag).optional(), @@ -860,7 +860,7 @@ export const zAgentAppPartial = z.object({ mode: z.string(), model_config: zModelConfigPartial.nullish(), name: z.string(), - permission_keys: z.array(z.string()).optional(), + permission_keys: z.array(z.string()), published_reference_count: z.int().optional().default(0), published_references: z.array(zAgentAppPublishedReferenceResponse).optional(), reference_count: z.int().nullish(), @@ -2483,7 +2483,7 @@ export const zAgentAppPartialWritable = z.object({ mode: z.string(), model_config: zModelConfigPartial.nullish(), name: z.string(), - permission_keys: z.array(z.string()).optional(), + permission_keys: z.array(z.string()), published_reference_count: z.int().optional().default(0), published_references: z.array(zAgentAppPublishedReferenceResponse).optional(), reference_count: z.int().nullish(), @@ -2566,7 +2566,7 @@ export const zAgentAppDetailWithSiteWritable = z.object({ mode: z.string(), model_config: zAppModelConfigResponse.nullish(), name: z.string(), - permission_keys: z.array(z.string()).optional(), + permission_keys: z.array(z.string()), role: z.string().nullish(), site: zAppDetailSiteResponseWritable.nullish(), tags: z.array(zTag).optional(), diff --git a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts index 0ff9cd3c520..eeadc47516e 100644 --- a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts +++ b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts @@ -377,6 +377,7 @@ import { zPostWorkspacesCurrentPluginUploadGithubResponse, zPostWorkspacesCurrentPluginUploadPkgBody, zPostWorkspacesCurrentPluginUploadPkgResponse, + zPostWorkspacesCurrentRbacAccessPoliciesBody, zPostWorkspacesCurrentRbacAccessPoliciesByPolicyIdCopyPath, zPostWorkspacesCurrentRbacAccessPoliciesByPolicyIdCopyResponse, zPostWorkspacesCurrentRbacAccessPoliciesResponse, @@ -480,6 +481,7 @@ import { zPutWorkspacesCurrentModelProvidersByProviderModelsCredentialsBody, zPutWorkspacesCurrentModelProvidersByProviderModelsCredentialsPath, zPutWorkspacesCurrentModelProvidersByProviderModelsCredentialsResponse, + zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdBody, zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdPath, zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponse, zPutWorkspacesCurrentRbacAccessPolicyBindingsByBindingIdLockPath, @@ -2348,7 +2350,12 @@ export const put5 = oc path: '/workspaces/current/rbac/access-policies/{policy_id}', tags: ['console'], }) - .input(z.object({ params: zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdPath })) + .input( + z.object({ + body: zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdBody, + params: zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdPath, + }), + ) .output(zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponse) export const byPolicyId = { @@ -2374,8 +2381,10 @@ export const post45 = oc method: 'POST', operationId: 'postWorkspacesCurrentRbacAccessPolicies', path: '/workspaces/current/rbac/access-policies', + successStatus: 201, tags: ['console'], }) + .input(z.object({ body: zPostWorkspacesCurrentRbacAccessPoliciesBody })) .output(zPostWorkspacesCurrentRbacAccessPoliciesResponse) export const accessPolicies = { diff --git a/packages/contracts/generated/api/console/workspaces/types.gen.ts b/packages/contracts/generated/api/console/workspaces/types.gen.ts index 4b3373e7bf1..dabaaf28a73 100644 --- a/packages/contracts/generated/api/console/workspaces/types.gen.ts +++ b/packages/contracts/generated/api/console/workspaces/types.gen.ts @@ -527,6 +527,33 @@ export type PluginCategoryListResponse = { plugins: Array } +export type AccessPolicyCreateRequest = { + description?: string + name: string + permission_keys?: Array + resource_type: RbacResourceType +} + +export type AccessPolicy = { + category?: string + created_at?: number + description?: string + id: string + is_builtin?: boolean + name: string + permission_keys?: Array + policy_key?: string + resource_type: string + tenant_id?: string + updated_at?: number +} + +export type AccessPolicyUpdateRequest = { + description?: string + name: string + permission_keys?: Array +} + export type DeleteMemberBindingsRequest = { account_ids?: Array } @@ -1655,6 +1682,8 @@ export type PluginCategoryInstalledPluginResponse = { version: string } +export type RbacResourceType = 'agent' | 'app' | 'dataset' + export type AccessPolicyMemberBinding = { access_policy_id: string account_id: string @@ -1690,20 +1719,6 @@ export type Pagination = { total_pages?: number } -export type AccessPolicy = { - category?: string - created_at?: number - description?: string - id: string - is_builtin?: boolean - name: string - permission_keys?: Array - policy_key?: string - resource_type: string - tenant_id?: string - updated_at?: number -} - export type RbacRole = { category?: string description?: string @@ -4372,16 +4387,14 @@ export type GetWorkspacesCurrentRbacAccessPoliciesResponse = GetWorkspacesCurrentRbacAccessPoliciesResponses[keyof GetWorkspacesCurrentRbacAccessPoliciesResponses] export type PostWorkspacesCurrentRbacAccessPoliciesData = { - body?: never + body: AccessPolicyCreateRequest path?: never query?: never url: '/workspaces/current/rbac/access-policies' } export type PostWorkspacesCurrentRbacAccessPoliciesResponses = { - 200: { - [key: string]: unknown - } + 201: AccessPolicy } export type PostWorkspacesCurrentRbacAccessPoliciesResponse = @@ -4424,7 +4437,7 @@ export type GetWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponse = GetWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponses[keyof GetWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponses] export type PutWorkspacesCurrentRbacAccessPoliciesByPolicyIdData = { - body?: never + body: AccessPolicyUpdateRequest path: { policy_id: string } @@ -4433,9 +4446,7 @@ export type PutWorkspacesCurrentRbacAccessPoliciesByPolicyIdData = { } export type PutWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponses = { - 200: { - [key: string]: unknown - } + 200: AccessPolicy } export type PutWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponse = diff --git a/packages/contracts/generated/api/console/workspaces/zod.gen.ts b/packages/contracts/generated/api/console/workspaces/zod.gen.ts index efec8abd342..2b3115878af 100644 --- a/packages/contracts/generated/api/console/workspaces/zod.gen.ts +++ b/packages/contracts/generated/api/console/workspaces/zod.gen.ts @@ -373,6 +373,32 @@ export const zParserGithubUpload = z.object({ version: z.string(), }) +/** + * AccessPolicy + */ +export const zAccessPolicy = z.object({ + category: z.string().optional().default(''), + created_at: z.int().optional().default(0), + description: z.string().optional().default(''), + id: z.string(), + is_builtin: z.boolean().optional().default(false), + name: z.string(), + permission_keys: z.array(z.string()).optional(), + policy_key: z.string().optional().default(''), + resource_type: z.string(), + tenant_id: z.string().optional().default(''), + updated_at: z.int().optional().default(0), +}) + +/** + * _AccessPolicyUpdateRequest + */ +export const zAccessPolicyUpdateRequest = z.object({ + description: z.string().optional().default(''), + name: z.string(), + permission_keys: z.array(z.string()).optional().default([]), +}) + /** * _DeleteMemberBindingsRequest */ @@ -388,6 +414,13 @@ export const zReplaceUserAccessPolicies = z.object({ account_ids: z.array(z.string()).optional(), }) +/** + * ReplaceUserAccessPoliciesResponse + */ +export const zReplaceUserAccessPoliciesResponse = z.object({ + access_policies: z.array(zAccessPolicy).optional(), +}) + /** * ResourceWhitelist */ @@ -1201,6 +1234,23 @@ export const zPluginPermissionResponse = z.object({ install_permission: zTenantPluginInstallPermission, }) +/** + * RBACResourceType + * + * Resource types understood by access policies. + */ +export const zRbacResourceType = z.enum(['agent', 'app', 'dataset']) + +/** + * _AccessPolicyCreateRequest + */ +export const zAccessPolicyCreateRequest = z.object({ + description: z.string().optional().default(''), + name: z.string(), + permission_keys: z.array(z.string()).optional().default([]), + resource_type: zRbacResourceType, +}) + /** * AccessPolicyMemberBinding */ @@ -1253,30 +1303,6 @@ export const zPagination = z.object({ total_pages: z.int().optional().default(0), }) -/** - * AccessPolicy - */ -export const zAccessPolicy = z.object({ - category: z.string().optional().default(''), - created_at: z.int().optional().default(0), - description: z.string().optional().default(''), - id: z.string(), - is_builtin: z.boolean().optional().default(false), - name: z.string(), - permission_keys: z.array(z.string()).optional(), - policy_key: z.string().optional().default(''), - resource_type: z.string(), - tenant_id: z.string().optional().default(''), - updated_at: z.int().optional().default(0), -}) - -/** - * ReplaceUserAccessPoliciesResponse - */ -export const zReplaceUserAccessPoliciesResponse = z.object({ - access_policies: z.array(zAccessPolicy).optional(), -}) - /** * RBACRole */ @@ -4830,10 +4856,12 @@ export const zGetWorkspacesCurrentPluginByCategoryListResponse = zPluginCategory */ export const zGetWorkspacesCurrentRbacAccessPoliciesResponse = z.record(z.string(), z.unknown()) +export const zPostWorkspacesCurrentRbacAccessPoliciesBody = zAccessPolicyCreateRequest + /** - * Success + * Policy created */ -export const zPostWorkspacesCurrentRbacAccessPoliciesResponse = z.record(z.string(), z.unknown()) +export const zPostWorkspacesCurrentRbacAccessPoliciesResponse = zAccessPolicy export const zDeleteWorkspacesCurrentRbacAccessPoliciesByPolicyIdPath = z.object({ policy_id: z.uuid(), @@ -4859,6 +4887,8 @@ export const zGetWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponse = z.recor z.unknown(), ) +export const zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdBody = zAccessPolicyUpdateRequest + export const zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdPath = z.object({ policy_id: z.uuid(), }) @@ -4866,10 +4896,7 @@ export const zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdPath = z.object({ /** * Success */ -export const zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponse = z.record( - z.string(), - z.unknown(), -) +export const zPutWorkspacesCurrentRbacAccessPoliciesByPolicyIdResponse = zAccessPolicy export const zPostWorkspacesCurrentRbacAccessPoliciesByPolicyIdCopyPath = z.object({ policy_id: z.uuid(), diff --git a/web/app/(commonLayout)/agents/[agentId]/access-config/page.tsx b/web/app/(commonLayout)/agents/[agentId]/access-config/page.tsx new file mode 100644 index 00000000000..0660a85d852 --- /dev/null +++ b/web/app/(commonLayout)/agents/[agentId]/access-config/page.tsx @@ -0,0 +1,6 @@ +import { AgentDetailPage } from '@/features/agent-v2/agent-detail/page' + +export default async function Page({ params }: { params: Promise<{ agentId: string }> }) { + const { agentId } = await params + return +} diff --git a/web/app/(commonLayout)/agents/__tests__/agents-access-guard.spec.tsx b/web/app/(commonLayout)/agents/__tests__/agents-access-guard.spec.tsx deleted file mode 100644 index b7c4d8507d5..00000000000 --- a/web/app/(commonLayout)/agents/__tests__/agents-access-guard.spec.tsx +++ /dev/null @@ -1,116 +0,0 @@ -import { screen, waitFor } from '@testing-library/react' -import { beforeEach, describe, expect, it, vi } from 'vite-plus/test' -import { render } from '@/test/console/render' -import { AgentsAccessGuard } from '../agents-access-guard' - -const mockReplace = vi.fn() -const mockConsoleStateReader = vi.fn() - -vi.mock('@/next/navigation', () => ({ - useRouter: () => ({ - replace: mockReplace, - }), -})) - -vi.mock('@/context/workspace-state', async () => { - const { createWorkspaceStateModuleMock } = await import('@/test/console/state-fixture') - - return createWorkspaceStateModuleMock(() => mockConsoleStateReader()) -}) -vi.mock('@/context/permission-state', async () => { - const { createPermissionStateModuleMock } = await import('@/test/console/state-fixture') - - return createPermissionStateModuleMock(() => mockConsoleStateReader()) -}) -vi.mock('@/features/agent-v2/permissions', () => { - return { - useCanManageAgents: () => - mockConsoleStateReader().workspacePermissionKeys.includes('agent.acl.preview'), - } -}) - -type ConsoleStateFixture = { - isLoadingCurrentWorkspace: boolean - isLoadingWorkspacePermissionKeys: boolean - workspacePermissionKeys: string[] - currentWorkspace: { - id: string - } -} - -const baseContext: ConsoleStateFixture = { - isLoadingCurrentWorkspace: false, - isLoadingWorkspacePermissionKeys: false, - workspacePermissionKeys: ['agent.acl.preview'], - currentWorkspace: { - id: 'workspace-1', - }, -} - -const setConsoleState = (overrides: Partial = {}) => { - mockConsoleStateReader.mockReturnValue({ - ...baseContext, - ...overrides, - }) -} - -describe('AgentsAccessGuard', () => { - beforeEach(() => { - vi.clearAllMocks() - setConsoleState() - }) - - it('renders loading while the workspace is loading', () => { - setConsoleState({ isLoadingCurrentWorkspace: true, currentWorkspace: { id: '' } }) - - render( - -
agents
-
, - ) - - expect(screen.getByRole('status')).toBeInTheDocument() - expect(screen.queryByText('agents')).not.toBeInTheDocument() - expect(mockReplace).not.toHaveBeenCalled() - }) - - it('renders loading while workspace permissions are loading', () => { - setConsoleState({ isLoadingWorkspacePermissionKeys: true }) - - render( - -
agents
-
, - ) - - expect(screen.getByRole('status')).toBeInTheDocument() - expect(screen.queryByText('agents')).not.toBeInTheDocument() - expect(mockReplace).not.toHaveBeenCalled() - }) - - it('redirects to /apps without agent.acl.preview', async () => { - setConsoleState({ workspacePermissionKeys: ['dataset.create_and_management'] }) - - render( - -
agents
-
, - ) - - expect(screen.queryByText('agents')).not.toBeInTheDocument() - await waitFor(() => { - expect(mockReplace).toHaveBeenCalledWith('/') - }) - }) - - it('renders children with agent.acl.preview', () => { - render( - -
agents
-
, - ) - - expect(screen.getByText('agents')).toBeInTheDocument() - expect(mockReplace).not.toHaveBeenCalled() - }) -}) diff --git a/web/app/(commonLayout)/agents/__tests__/layout.spec.tsx b/web/app/(commonLayout)/agents/__tests__/layout.spec.tsx index edb7035db74..6746cc82f70 100644 --- a/web/app/(commonLayout)/agents/__tests__/layout.spec.tsx +++ b/web/app/(commonLayout)/agents/__tests__/layout.spec.tsx @@ -1,4 +1,3 @@ -import type { ReactNode } from 'react' import type { Dependency } from '@/app/components/plugins/types' import { render, screen } from '@testing-library/react' import { useStore as usePluginDependencyStore } from '@/app/components/workflow/plugin-dependency/store' @@ -19,12 +18,6 @@ vi.mock('../feature-guard', () => ({ guardAgentV2Route: () => mocks.guardAgentV2Route(), })) -// Access control is covered by agents-access-guard.spec.tsx; this suite is -// about the feature-flag guard only. -vi.mock('../agents-access-guard', () => ({ - AgentsAccessGuard: ({ children }: { children: ReactNode }) => <>{children}, -})) - describe('RosterLayout', () => { beforeEach(() => { vi.clearAllMocks() diff --git a/web/app/(commonLayout)/agents/agents-access-guard.tsx b/web/app/(commonLayout)/agents/agents-access-guard.tsx deleted file mode 100644 index 2b0002df750..00000000000 --- a/web/app/(commonLayout)/agents/agents-access-guard.tsx +++ /dev/null @@ -1,30 +0,0 @@ -'use client' - -import type { ReactNode } from 'react' -import { useAtomValue } from 'jotai' -import { useEffect } from 'react' -import Loading from '@/app/components/base/loading' -import { workspacePermissionKeysLoadingAtom } from '@/context/permission-state' -import { currentWorkspaceIdAtom, currentWorkspaceLoadingAtom } from '@/context/workspace-state' -import { useCanManageAgents } from '@/features/agent-v2/permissions' -import { useRouter } from '@/next/navigation' - -export function AgentsAccessGuard({ children }: { children: ReactNode }) { - const currentWorkspaceId = useAtomValue(currentWorkspaceIdAtom) - const isLoadingCurrentWorkspace = useAtomValue(currentWorkspaceLoadingAtom) - const isLoadingWorkspacePermissionKeys = useAtomValue(workspacePermissionKeysLoadingAtom) - const canManageAgents = useCanManageAgents() - const router = useRouter() - const isLoadingAccess = isLoadingCurrentWorkspace || isLoadingWorkspacePermissionKeys - const shouldRedirect = !isLoadingAccess && !!currentWorkspaceId && !canManageAgents - - useEffect(() => { - if (shouldRedirect) router.replace('/') - }, [shouldRedirect, router]) - - if (isLoadingAccess || !currentWorkspaceId) return - - if (shouldRedirect) return null - - return children -} diff --git a/web/app/(commonLayout)/agents/layout.tsx b/web/app/(commonLayout)/agents/layout.tsx index ec47488a564..b65ce3ffa0c 100644 --- a/web/app/(commonLayout)/agents/layout.tsx +++ b/web/app/(commonLayout)/agents/layout.tsx @@ -1,15 +1,14 @@ import type { ReactNode } from 'react' import PluginDependency from '@/app/components/workflow/plugin-dependency' -import { AgentsAccessGuard } from './agents-access-guard' import { guardAgentV2Route } from './feature-guard' export default function Layout({ children }: { children: ReactNode }) { guardAgentV2Route() return ( - + <> {children} - + ) } diff --git a/web/app/components/access-rules-editor/__tests__/index.spec.tsx b/web/app/components/access-rules-editor/__tests__/index.spec.tsx index d13d09a3332..4a6b498ece5 100644 --- a/web/app/components/access-rules-editor/__tests__/index.spec.tsx +++ b/web/app/components/access-rules-editor/__tests__/index.spec.tsx @@ -8,10 +8,11 @@ const mockMembers = vi.hoisted(() => ({ accounts: [] as Member[] | null, isLoading: false, })) -const mockUseMembers = vi.hoisted(() => vi.fn()) +const mockMembersQuery = vi.hoisted(() => vi.fn()) -vi.mock('@/service/use-common', () => ({ - useMembers: mockUseMembers, +vi.mock('@tanstack/react-query', async (importOriginal) => ({ + ...(await importOriginal()), + useQuery: mockMembersQuery, })) const createRule = (resourceType: 'app' | 'dataset'): AccessPolicyWithBindings => ({ @@ -89,9 +90,9 @@ describe('AccessRulesEditor', () => { vi.clearAllMocks() mockMembers.accounts = [] mockMembers.isLoading = false - mockUseMembers.mockImplementation(() => ({ + mockMembersQuery.mockImplementation(() => ({ data: { accounts: mockMembers.accounts }, - isLoading: mockMembers.isLoading, + isPending: mockMembers.isLoading, })) }) @@ -433,9 +434,9 @@ describe('AccessRulesEditor', () => { />, ) - expect(mockUseMembers).not.toHaveBeenCalled() + expect(mockMembersQuery).not.toHaveBeenCalled() await user.click(screen.getByRole('button', { name: 'common.operation.add' })) - expect(mockUseMembers).toHaveBeenCalledTimes(1) + expect(mockMembersQuery).toHaveBeenCalledTimes(1) const dialog = await screen.findByRole('dialog', { name: 'permission.accessRule.addMembersTitle', diff --git a/web/app/components/access-rules-editor/add-access-subject-popover.tsx b/web/app/components/access-rules-editor/add-access-subject-popover.tsx index b024cf7eb1e..3175f1fd500 100644 --- a/web/app/components/access-rules-editor/add-access-subject-popover.tsx +++ b/web/app/components/access-rules-editor/add-access-subject-popover.tsx @@ -1,15 +1,15 @@ 'use client' -import type { Member } from '@/models/common' import { Avatar } from '@langgenius/dify-ui/avatar' import { Button } from '@langgenius/dify-ui/button' import { cn } from '@langgenius/dify-ui/cn' import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group' import { Popover, PopoverContent, PopoverTitle, PopoverTrigger } from '@langgenius/dify-ui/popover' +import { useQuery } from '@tanstack/react-query' import { memo, useCallback, useMemo, useState } from 'react' import { useTranslation } from 'react-i18next' import Loading from '@/app/components/base/loading' -import { useMembers } from '@/service/use-common' +import { consoleQuery } from '@/service/console' import { DEFAULT_ACCESS_POLICY_ID } from './constants' type AddAccessSubjectPopoverProps = { @@ -32,7 +32,12 @@ function AddAccessSubjectPopoverContent({ }: AddAccessSubjectPopoverContentProps) { const { t } = useTranslation() const [searchValue, setSearchValue] = useState('') - const { data: membersData, isLoading } = useMembers() + const { + data: membersData, + isPending: isLoading, + error, + refetch, + } = useQuery(consoleQuery.workspaces.current.members.get.queryOptions()) const existingAccountIdSet = useMemo(() => new Set(existingAccountIds), [existingAccountIds]) const availableMembers = useMemo(() => { const normalizedSearchValue = searchValue.trim().toLowerCase() @@ -49,13 +54,6 @@ function AddAccessSubjectPopoverContent({ }) }, [membersData?.accounts, searchValue]) - const handleAddMember = useCallback( - (member: Member) => { - onAddAccessSubject(member.id, [DEFAULT_ACCESS_POLICY_ID]) - }, - [onAddAccessSubject], - ) - const addLabel = t(($) => $['operation.add'], { ns: 'common' }) const addMembersTitle = t(($) => $['accessRule.addMembersTitle'], { ns: 'permission' }) const addedLabel = t(($) => $['operation.added'], { ns: 'common' }) @@ -87,7 +85,14 @@ function AddAccessSubjectPopoverContent({ - {isLoading ? ( + {error ? ( +
+ {t(($) => $['api.actionFailed'], { ns: 'common' })} + +
+ ) : isLoading ? (
@@ -143,7 +148,7 @@ function AddAccessSubjectPopoverContent({ 'hover:bg-state-accent-hover focus-visible:bg-state-accent-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid', 'disabled:cursor-not-allowed disabled:text-text-disabled disabled:hover:bg-transparent', )} - onClick={() => handleAddMember(member)} + onClick={() => onAddAccessSubject(member.id, [DEFAULT_ACCESS_POLICY_ID])} > {isUpdating ? ( diff --git a/web/app/components/access-rules-editor/index.tsx b/web/app/components/access-rules-editor/index.tsx index 39a72eb2d15..1810c04da43 100644 --- a/web/app/components/access-rules-editor/index.tsx +++ b/web/app/components/access-rules-editor/index.tsx @@ -1,6 +1,9 @@ 'use client' -import type { AccessPolicyWithBindings, ResourceUserAccessSetting } from '@/models/access-control' +import type { + AccessPolicy, + ResourceUserAccessPolicies, +} from '@dify/contracts/api/console/workspaces/types.gen' import { Button } from '@langgenius/dify-ui/button' import { Checkbox } from '@langgenius/dify-ui/checkbox' import { cn } from '@langgenius/dify-ui/cn' @@ -21,8 +24,8 @@ export type AccessPolicyMemberBindingRemoval = { } export type AccessRulesEditorProps = { - rules: AccessPolicyWithBindings[] - userAccessSettings: ResourceUserAccessSetting[] + rules: { policy?: Pick | null }[] + userAccessSettings: ResourceUserAccessPolicies[] isLoadingRules: boolean isLoadingUserAccessSettings: boolean automaticIncludeWorkspaceMembers?: boolean @@ -77,17 +80,23 @@ function AccessRulesEditor({ const shouldCenterTableBody = isLoading || userAccessSettings.length === 0 const areMembershipChangesDisabled = automaticIncludeWorkspaceMembers === true const policyOptions = useMemo(() => { - return rules.map((rule) => ({ - id: rule.policy.id, - name: rule.policy.name, - })) + return rules.flatMap((rule) => + rule.policy + ? [ + { + id: rule.policy.id, + name: rule.policy.name, + }, + ] + : [], + ) }, [rules]) const protectedAccountIds = useMemo(() => { const accountIds = new Set() for (const setting of userAccessSettings) { const accountId = setting.account.account_id - const isWorkspaceOwner = setting.roles.some((role) => role.role_tag === 'owner') + const isWorkspaceOwner = setting.roles?.some((role) => role.role_tag === 'owner') if (accountId === maintainerId || isWorkspaceOwner) accountIds.add(accountId) } @@ -119,7 +128,7 @@ function AccessRulesEditor({ const accountId = setting.account.account_id if (!selectedAccountIds.has(accountId) || protectedAccountIds.has(accountId)) continue - const accessPolicyId = setting.access_policies[0]?.id ?? DEFAULT_ACCESS_POLICY_ID + const accessPolicyId = setting.access_policies?.[0]?.id ?? DEFAULT_ACCESS_POLICY_ID const accountIds = accountIdsByAccessPolicyId.get(accessPolicyId) if (accountIds) accountIds.push(accountId) else accountIdsByAccessPolicyId.set(accessPolicyId, [accountId]) diff --git a/web/app/components/access-rules-editor/user-access-policy-row.tsx b/web/app/components/access-rules-editor/user-access-policy-row.tsx index 75b2ee7c70b..8db26ca5603 100644 --- a/web/app/components/access-rules-editor/user-access-policy-row.tsx +++ b/web/app/components/access-rules-editor/user-access-policy-row.tsx @@ -1,6 +1,6 @@ 'use client' -import type { ResourceUserAccessSetting } from '@/models/access-control' +import type { ResourceUserAccessPolicies } from '@dify/contracts/api/console/workspaces/types.gen' import { Avatar } from '@langgenius/dify-ui/avatar' import { Checkbox } from '@langgenius/dify-ui/checkbox' import { cn } from '@langgenius/dify-ui/cn' @@ -23,7 +23,7 @@ type PolicyOption = { } type UserAccessPolicyRowProps = { - setting: ResourceUserAccessSetting + setting: ResourceUserAccessPolicies policyOptions: PolicyOption[] disabled: boolean membershipChangesDisabled?: boolean @@ -53,15 +53,16 @@ function UserAccessPolicyRow({ }: UserAccessPolicyRowProps) { const { t } = useTranslation() const accountId = setting.account.account_id - const selectedPolicy = setting.access_policies[0] + const accountName = setting.account.account_name || setting.account.email || accountId + const selectedPolicy = setting.access_policies?.[0] const selectedPolicyId = selectedPolicy?.id ?? DEFAULT_ACCESS_POLICY_ID const isPolicySelectDisabled = disabled || isProtected || !onChange const isRemoveDisabled = disabled || membershipChangesDisabled || isProtected || !onRemove const isSelectionDisabled = disabled || membershipChangesDisabled || selectionDisabled || isProtected || !onSelectedChange const defaultAccessPolicyName = t(($) => $['accessRule.defaultPermission'], { ns: 'permission' }) - const accountEmail = setting.account.email || setting.account.account_name - const isWorkspaceOwner = setting.roles.some((role) => role.role_tag === 'owner') + const accountEmail = setting.account.email || accountName + const isWorkspaceOwner = setting.roles?.some((role) => role.role_tag === 'owner') const handlePolicyChange = useCallback( (nextPolicyId: string | null) => { @@ -82,22 +83,20 @@ function UserAccessPolicyRow({ onSelectedChange?.(accountId, checked)} />
- - {setting.account.account_name} - + {accountName} {isMaintainer && ( {t(($) => $['accessRule.maintainer'], { ns: 'permission' })} @@ -117,7 +116,7 @@ function UserAccessPolicyRow({ $['accessRule.exceptionPermissionFor'], { ns: 'permission', - name: setting.account.account_name, + name: accountName, })} size="small" disabled={isPolicySelectDisabled} @@ -126,7 +125,7 @@ function UserAccessPolicyRow({ {selectedPolicyId === DEFAULT_ACCESS_POLICY_ID ? defaultAccessPolicyName - : setting.access_policies[0]?.name} + : selectedPolicy?.name} diff --git a/web/app/components/app/create-app-dropdown.tsx b/web/app/components/app/create-app-dropdown.tsx index 9d7290674bc..ee8d6301e30 100644 --- a/web/app/components/app/create-app-dropdown.tsx +++ b/web/app/components/app/create-app-dropdown.tsx @@ -15,9 +15,9 @@ import { } from '@/app/components/step-by-step-tour/dropdown-menu' type CreateAppDropdownProps = { - onCreateBlank: () => void + onCreateBlank?: () => void onCreateTemplate?: () => void - onImportDSL: () => void + onImportDSL?: () => void stepByStepTourControlledOpen?: boolean stepByStepTourTarget?: string stepByStepTourHighlightPart?: string @@ -62,56 +62,64 @@ export function CreateAppDropdown({ className: 'w-70 p-0', })} > -
- - - - {t(($) => $['newApp.startFromBlank'], { ns: 'app' })} - - - {onCreateTemplate && ( + {(onCreateBlank || onCreateTemplate) && ( +
+ {onCreateBlank && ( + + + + {t(($) => $['newApp.startFromBlank'], { ns: 'app' })} + + + )} + {onCreateTemplate && ( + + + + {t(($) => $['newApp.startFromTemplate'], { ns: 'app' })} + + + )} +
+ )} + {onImportDSL && (onCreateBlank || onCreateTemplate) && ( +
+ )} + {onImportDSL && ( +
- - - {t(($) => $['newApp.startFromTemplate'], { ns: 'app' })} + + + + + + {t(($) => $.importDSL, { ns: 'app' })} + + + {t(($) => $['newApp.dropDSLToCreateApp'], { ns: 'app' })} + - )} -
-
-
- - - - - - - {t(($) => $.importDSL, { ns: 'app' })} - - - {t(($) => $['newApp.dropDSLToCreateApp'], { ns: 'app' })} - - - -
+
+ )} ) diff --git a/web/app/components/goto-anything/__tests__/index.spec.tsx b/web/app/components/goto-anything/__tests__/index.spec.tsx index 4cc4b3a0751..1cc2c2582e9 100644 --- a/web/app/components/goto-anything/__tests__/index.spec.tsx +++ b/web/app/components/goto-anything/__tests__/index.spec.tsx @@ -130,7 +130,6 @@ vi.mock('../actions/agent', () => ({ const visibilityState = vi.hoisted(() => ({ agentEnabled: true, - canManageAgents: true, datasetOperator: false, enableSkill: true, })) @@ -147,10 +146,6 @@ vi.mock('@/features/agent-v2/feature-flag', () => ({ isAgentV2Enabled: () => visibilityState.agentEnabled, })) -vi.mock('@/features/agent-v2/permissions', () => ({ - useCanManageAgents: () => visibilityState.canManageAgents, -})) - vi.mock( '@/app/components/plugins/install-plugin/hooks/use-workspace-plugin-install-permission', () => ({ @@ -273,7 +268,6 @@ describe('GotoAnything', () => { previousRemoteData = {} matchActionMock.mockReset() visibilityState.agentEnabled = true - visibilityState.canManageAgents = true visibilityState.datasetOperator = false visibilityState.enableSkill = true mockFindCommand = null @@ -419,26 +413,10 @@ describe('GotoAnything', () => { describe('search functionality', () => { it.each([ - [ - { agentEnabled: true, canManageAgents: true, datasetOperator: false, enableSkill: true }, - true, - true, - ], - [ - { agentEnabled: false, canManageAgents: true, datasetOperator: false, enableSkill: true }, - false, - true, - ], - [ - { agentEnabled: true, canManageAgents: false, datasetOperator: true, enableSkill: true }, - false, - false, - ], - [ - { agentEnabled: true, canManageAgents: true, datasetOperator: false, enableSkill: false }, - true, - false, - ], + [{ agentEnabled: true, datasetOperator: false, enableSkill: true }, true, true], + [{ agentEnabled: false, datasetOperator: false, enableSkill: true }, false, true], + [{ agentEnabled: true, datasetOperator: true, enableSkill: true }, true, false], + [{ agentEnabled: true, datasetOperator: false, enableSkill: false }, true, false], ] as const)( 'matches scope visibility to workspace capabilities', (visibility, agents, skills) => { diff --git a/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx b/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx index 5a11cce8ae1..6949e886050 100644 --- a/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx +++ b/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx @@ -24,6 +24,7 @@ function agent(overrides: Partial = {}): AgentAppPartial { description: 'Investigates a topic', mode: 'agent-chat', icon_url: null, + permission_keys: [], ...overrides, } } diff --git a/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx b/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx index 09467e3ef40..79eba4cbde2 100644 --- a/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx +++ b/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx @@ -49,9 +49,6 @@ vi.mock('@/i18n-config', () => ({ vi.mock('@/features/agent-v2/feature-flag', () => ({ isAgentV2Enabled: () => true, })) -vi.mock('@/features/agent-v2/permissions', () => ({ - useCanManageAgents: () => true, -})) vi.mock('../command-bus', () => ({ executeCommand: (...args: unknown[]) => mockExecuteCommand(...args), diff --git a/web/app/components/goto-anything/actions/commands/slash-provider.tsx b/web/app/components/goto-anything/actions/commands/slash-provider.tsx index 0c1ce0c3c32..60f74003288 100644 --- a/web/app/components/goto-anything/actions/commands/slash-provider.tsx +++ b/web/app/components/goto-anything/actions/commands/slash-provider.tsx @@ -6,7 +6,6 @@ import { ENABLE_FEATURE_PREVIEW } from '@/config' import { useDocLink } from '@/context/i18n' import { isCurrentWorkspaceDatasetOperatorAtom } from '@/context/workspace-state' import { isAgentV2Enabled } from '@/features/agent-v2/feature-flag' -import { useCanManageAgents } from '@/features/agent-v2/permissions' import { setLocaleOnClient } from '@/i18n-config' import { accountCommand } from './account' import { createCommand } from './create' @@ -61,9 +60,8 @@ const unregisterSlashCommands = () => { export const SlashCommandProvider = () => { const theme = useTheme() const getDocsHomeUrl = useDocLink() - const canManageAgents = useCanManageAgents() const isCurrentWorkspaceDatasetOperator = useAtomValue(isCurrentWorkspaceDatasetOperatorAtom) - const agentsAvailable = isAgentV2Enabled() && canManageAgents + const agentsAvailable = isAgentV2Enabled() const skillsAvailable = !isCurrentWorkspaceDatasetOperator useEffect(() => { registerSlashCommands({ diff --git a/web/app/components/goto-anything/index.tsx b/web/app/components/goto-anything/index.tsx index b0a23c860e2..052eaaefd2b 100644 --- a/web/app/components/goto-anything/index.tsx +++ b/web/app/components/goto-anything/index.tsx @@ -42,7 +42,6 @@ import { selectWorkflowNode } from '@/app/components/workflow/utils/node-navigat import { useGetLanguage } from '@/context/i18n' import { isCurrentWorkspaceDatasetOperatorAtom } from '@/context/workspace-state' import { isAgentV2Enabled } from '@/features/agent-v2/feature-flag' -import { useCanManageAgents } from '@/features/agent-v2/permissions' import { usePathname, useRouter } from '@/next/navigation' import { consoleQuery } from '@/service/console' import { PluginInstallPermissionProvider } from '../plugins/install-plugin/components/plugin-install-permission-provider' @@ -231,14 +230,13 @@ export function GotoAnything() { const pathname = usePathname() const router = useRouter() const defaultLocale = useGetLanguage() - const canManageAgents = useCanManageAgents() const isCurrentWorkspaceDatasetOperator = useAtomValue(isCurrentWorkspaceDatasetOperatorAtom) const { data: enableSkill } = useQuery( consoleQuery.features.get.queryOptions({ select: (features) => features.enable_skill, }), ) - const agentsAvailable = isAgentV2Enabled() && canManageAgents + const agentsAvailable = isAgentV2Enabled() const skillsAvailable = enableSkill === true && !isCurrentWorkspaceDatasetOperator const isWorkflowPage = appWorkflowPathPattern.test(pathname) || sharedWorkflowPathPattern.test(pathname) diff --git a/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx b/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx index 062fa3cc61a..6e84c8e014b 100644 --- a/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx +++ b/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx @@ -37,11 +37,8 @@ const permissionGroups = [ }), ] -const getPermissionRow = (permissionName: string) => - screen.getByText(permissionName).closest('div')! - const getPermissionCheckbox = (permissionName: string) => - within(getPermissionRow(permissionName)).getByRole('checkbox') + screen.getByRole('checkbox', { name: permissionName }) describe('PermissionGroupList', () => { beforeEach(() => { diff --git a/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx b/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx index 5eed388f2fa..40d97383f55 100644 --- a/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx +++ b/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx @@ -1,5 +1,5 @@ import type { ReactNode } from 'react' -import type { AccessPolicyWithBindings } from '@/models/access-control' +import type { AccessRule } from '../types' import { QueryClient, QueryClientProvider } from '@tanstack/react-query' import { screen } from '@testing-library/react' import userEvent from '@testing-library/user-event' @@ -17,7 +17,7 @@ vi.mock('@/context/permission-state', async () => { })) }) -const rule: AccessPolicyWithBindings = { +const rule: AccessRule = { policy: { id: 'app-rule-1', tenant_id: 'tenant-1', @@ -28,8 +28,8 @@ const rule: AccessPolicyWithBindings = { permission_keys: ['app.edit'], is_builtin: true, category: 'global_system_default', - created_at: '2026-01-01', - updated_at: '2026-01-01', + created_at: 1767225600, + updated_at: 1767225600, }, roles: [ { @@ -44,6 +44,8 @@ const rule: AccessPolicyWithBindings = { { account_id: 'account-1', account_name: 'Levi', + avatar: '', + email: 'levi@example.com', binding_id: 'account-binding-1', is_locked: false, }, diff --git a/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx index 6d498d4fe85..e4799d12ea1 100644 --- a/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx +++ b/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx @@ -1,274 +1,204 @@ -import type { AccessPolicyWithBindings } from '@/models/access-control' -import { toast } from '@langgenius/dify-ui/toast' -import { render, screen } from '@testing-library/react' +import { act, render, screen, waitFor, within } from '@testing-library/react' import userEvent from '@testing-library/user-event' -import { - useCreateAccessRule, - useInfiniteWorkspaceAppAccessRules, - useInfiniteWorkspaceDatasetAccessRules, - useUpdateAccessRule, -} from '@/service/access-control/use-workspace-access-rules' +import { consoleQuery } from '@/service/console' +import { createConsoleQueryWrapper } from '@/test/console/query-data' +import { seedWorkspacePermissionsQuery } from '@/test/console/workspace-permissions' +import { createAccessPolicyFixture } from '@/test/fixtures/access-policy' import AccessRulesPage from '../index' -const mocks = vi.hoisted(() => ({ - createAccessRule: vi.fn(), - updateAccessRule: vi.fn(), +const request = vi.hoisted(() => vi.fn()) +vi.mock('@/service/base', async (importOriginal) => ({ + ...(await importOriginal()), + request, })) -vi.mock('@langgenius/dify-ui/toast', () => ({ - toast: { - success: vi.fn(), - }, -})) - -vi.mock('@/service/access-control/use-workspace-access-rules', () => ({ - workspaceAccessRulesQueryKeys: { - app: () => ['workspace-access-rules', 'app'], - dataset: () => ['workspace-access-rules', 'dataset'], - }, - useCreateAccessRule: vi.fn(), - useInfiniteWorkspaceAppAccessRules: vi.fn(), - useInfiniteWorkspaceDatasetAccessRules: vi.fn(), - useUpdateAccessRule: vi.fn(), -})) - -vi.mock('../access-rule-section', () => ({ - default: ({ - title, - rules, - onCreate, - onEditRule, - }: { - title: string - rules: AccessPolicyWithBindings[] - onCreate: () => void - onEditRule: (rule: AccessPolicyWithBindings) => void - }) => ( -
-

{title}

- - -
- ), -})) - -vi.mock('../permission-set-modal', () => ({ - default: ({ - mode, - resourceType, - initialValues, - onSubmit, - }: { - mode: string - resourceType: string - initialValues?: { name: string; description: string; permissionKeys: string[] } - onSubmit: (values: { name: string; description: string; permissionKeys: string[] }) => void - }) => ( -
- {initialValues?.name} - -
- ), -})) - -const appRule: AccessPolicyWithBindings = { - policy: { - id: 'app-rule-1', - tenant_id: 'tenant-1', - resource_type: 'app', - policy_key: 'app-rule', - name: 'App rule', - description: 'App rule description', - permission_keys: ['app.acl.edit'], - is_builtin: false, - category: 'global_custom', - created_at: '2026-01-01', - updated_at: '2026-01-01', - }, - roles: [ - { - role_id: 'role-1', - role_name: 'Role 1', - binding_id: 'role-binding-1', - is_locked: false, - role_tag: '', - }, - ], - accounts: [ - { - account_id: 'member-1', - account_name: 'Member 1', - binding_id: 'member-binding-1', - is_locked: false, - }, - ], +const pagination = { total_count: 1, per_page: 20, current_page: 1, total_pages: 1 } +const providers = { + app: consoleQuery.workspaces.current.rbac.workspace.apps.accessPolicy.get, + dataset: consoleQuery.workspaces.current.rbac.workspace.datasets.accessPolicy.get, + agent: consoleQuery.workspaces.current.rbac.workspace.agents.accessPolicy.get, } +const resourceTypes = ['app', 'dataset', 'agent'] as const +const sent: Request[] = [] -const datasetRule: AccessPolicyWithBindings = { - policy: { - ...appRule.policy, - id: 'dataset-rule-1', - resource_type: 'dataset', - policy_key: 'dataset-rule', - name: 'Dataset rule', - permission_keys: ['dataset.acl.edit'], - }, - roles: [ - { - role_id: 'dataset-role-1', - role_name: 'Dataset Role 1', - binding_id: 'dataset-role-binding-1', - is_locked: false, - role_tag: '', - }, - ], - accounts: [ - { - account_id: 'dataset-member-1', - account_name: 'Dataset Member 1', - binding_id: 'dataset-member-binding-1', - is_locked: false, - }, - ], -} - -const mockMutation = (mock: ReturnType) => { - mock.mockImplementation((_payload, options) => { - options?.onSuccess?.() - return Promise.resolve() +function setup({ canManage = true, builtin = false } = {}) { + const { wrapper, queryClient } = createConsoleQueryWrapper({ + workspacePermissionKeys: canManage ? ['workspace.role.manage'] : [], }) - - return { - mutate: mock, - mutateAsync: mock, + for (const resourceType of resourceTypes) { + const rule = createAccessPolicyFixture({ + id: `${resourceType}-rule`, + resource_type: resourceType, + name: `${resourceType} rule`, + permission_keys: [`${resourceType}.acl.edit`], + is_builtin: builtin, + }) + queryClient.setQueryData( + providers[resourceType].infiniteOptions({ + input: (page) => ({ query: { language: 'en', page, limit: 20 } }), + initialPageParam: 1, + getNextPageParam: () => undefined, + }).queryKey, + { + pages: [{ items: [{ policy: rule, accounts: [], roles: [] }], pagination }], + pageParams: [1], + }, + ) + queryClient.setQueryData( + consoleQuery.workspaces.current.rbac.rolePermissions.catalog[resourceType].get.queryKey({ + input: {}, + }), + { + groups: [ + { + group_key: `${resourceType}_acl`, + group_name: resourceType, + description: '', + permissions: [ + { key: `${resourceType}.acl.edit`, name: 'Edit configuration', description: '' }, + ], + }, + ], + }, + ) } + request.mockImplementation( + async (_url: string, _init: RequestInit, options: { request: Request }) => { + const req = options.request + sent.push(req.clone()) + if (req.method === 'GET') { + const resourceType = new URL(req.url).pathname.includes('/datasets/') + ? 'dataset' + : new URL(req.url).pathname.includes('/apps/') + ? 'app' + : 'agent' + return Response.json({ + items: [ + { + policy: createAccessPolicyFixture({ resource_type: resourceType }), + accounts: [], + roles: [], + }, + ], + pagination, + }) + } + return Response.json(createAccessPolicyFixture()) + }, + ) + return { ...render(, { wrapper }), queryClient } } -const pagination = { - total_count: 1, - per_page: 20, - current_page: 1, - total_pages: 1, -} - -const setupHooks = () => { - vi.mocked(useInfiniteWorkspaceAppAccessRules).mockReturnValue({ - data: { pages: [{ items: [appRule], pagination }], pageParams: [1] }, - isLoading: false, - isFetchingNextPage: false, - fetchNextPage: vi.fn(), - hasNextPage: false, - error: null, - } as unknown as ReturnType) - vi.mocked(useInfiniteWorkspaceDatasetAccessRules).mockReturnValue({ - data: { pages: [{ items: [datasetRule], pagination }], pageParams: [1] }, - isLoading: false, - isFetchingNextPage: false, - fetchNextPage: vi.fn(), - hasNextPage: false, - error: null, - } as unknown as ReturnType) - vi.mocked(useCreateAccessRule).mockReturnValue( - mockMutation(mocks.createAccessRule) as unknown as ReturnType, - ) - vi.mocked(useUpdateAccessRule).mockReturnValue( - mockMutation(mocks.updateAccessRule) as unknown as ReturnType, - ) +async function openSection(resourceType: (typeof resourceTypes)[number]) { + const trigger = screen.getByRole('button', { + name: new RegExp(`^permission.accessRule.${resourceType}Title`), + }) + if (trigger.getAttribute('aria-expanded') !== 'true') await userEvent.click(trigger) + return trigger.closest('section')! } describe('AccessRulesPage', () => { beforeEach(() => { vi.clearAllMocks() - setupHooks() + sent.length = 0 }) - it('renders app and dataset access rule sections', () => { - render() + it('renders App, Dataset, and Agent permission sets', () => { + setup() + for (const type of resourceTypes) + expect( + screen.getByRole('button', { name: new RegExp(`^permission.accessRule.${type}Title`) }), + ).toBeInTheDocument() + }) + it.each(resourceTypes)( + 'creates a %s permission set through the generated endpoint', + async (type) => { + setup() + const section = await openSection(type) + await userEvent.click( + within(section).getByRole('button', { name: 'permission.accessRule.newPermissionSet' }), + ) + const dialog = screen.getByRole('dialog') + await userEvent.type( + within(dialog).getByRole('textbox', { name: /permissionSet.nameLabel/ }), + 'Custom policy', + ) + await userEvent.click( + within(dialog).getByRole('checkbox', { name: new RegExp(`${type}.acl.edit`) }), + ) + await userEvent.click( + within(dialog).getByRole('button', { name: 'common.operation.confirm' }), + ) + await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument()) + const mutation = sent.find((req) => req.method === 'POST')! + expect(new URL(mutation.url).pathname).toMatch(/\/rbac\/access-policies$/) + expect(await mutation.json()).toEqual({ + name: 'Custom policy', + description: '', + permission_keys: [`${type}.acl.edit`], + resource_type: type, + }) + }, + ) + + it.each(resourceTypes)( + 'updates a %s permission set with the generated request body', + async (type) => { + setup() + const section = await openSection(type) + await userEvent.click( + within(section).getByRole('button', { name: 'common.operation.moreActions' }), + ) + await userEvent.click(screen.getByRole('menuitem', { name: 'common.operation.edit' })) + await userEvent.type( + screen.getByRole('textbox', { name: 'permission.permissionSet.descriptionLabel' }), + ' updated', + ) + await userEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' })) + await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument()) + const mutation = sent.find((req) => req.method === 'PUT')! + expect(new URL(mutation.url).pathname).toMatch(new RegExp(`/access-policies/${type}-rule$`)) + expect(await mutation.json()).toMatchObject({ + name: `${type} rule`, + description: 'Edit Agent configuration updated', + permission_keys: [`${type}.acl.edit`], + }) + }, + ) + + it('keeps built-in Agent policies read-only and offers duplication', async () => { + setup({ builtin: true }) + const section = await openSection('agent') + await userEvent.click( + within(section).getByRole('button', { name: 'common.operation.moreActions' }), + ) expect( - screen.getByRole('heading', { name: 'permission.accessRule.appTitle' }), - ).toBeInTheDocument() + screen.queryByRole('menuitem', { name: 'common.operation.delete' }), + ).not.toBeInTheDocument() expect( - screen.getByRole('heading', { name: 'permission.accessRule.datasetTitle' }), + screen.getByRole('menuitem', { name: 'permission.common.duplicateAction' }), ).toBeInTheDocument() + await userEvent.click(screen.getByRole('menuitem', { name: 'common.operation.view' })) + expect(screen.getByRole('textbox', { name: /permissionSet.nameLabel/ })).toBeDisabled() + expect( + screen.queryByRole('button', { name: 'common.operation.confirm' }), + ).not.toBeInTheDocument() }) - it('creates app permission sets with app resource type', async () => { - render() - + it('closes a mutation dialog when role management is revoked', async () => { + const { queryClient } = setup() + const section = await openSection('agent') await userEvent.click( - screen.getByRole('button', { name: 'create permission.accessRule.appTitle' }), + within(section).getByRole('button', { name: 'permission.accessRule.newPermissionSet' }), ) - await userEvent.click(screen.getByRole('button', { name: 'submit permission set' })) - - expect(mocks.createAccessRule).toHaveBeenCalledWith( - { - name: 'app permission', - description: 'app description', - permission_keys: ['app.acl.edit'], - resourceType: 'app', - }, - expect.any(Object), - ) - expect(toast.success).toHaveBeenCalledWith('permission.accessRule.created') - }) - - it('creates dataset permission sets with dataset resource type', async () => { - render() - - await userEvent.click( - screen.getByRole('button', { name: 'create permission.accessRule.datasetTitle' }), - ) - await userEvent.click(screen.getByRole('button', { name: 'submit permission set' })) - - expect(mocks.createAccessRule).toHaveBeenCalledWith( - { - name: 'dataset permission', - description: 'dataset description', - permission_keys: ['dataset.acl.edit'], - resourceType: 'dataset', - }, - expect.any(Object), - ) - expect(toast.success).toHaveBeenCalledWith('permission.accessRule.created') - }) - - it('updates dataset permission sets with dataset resource type', async () => { - render() - - await userEvent.click( - screen.getByRole('button', { name: 'edit permission.accessRule.datasetTitle' }), - ) - expect(screen.getByText('Dataset rule')).toBeInTheDocument() - await userEvent.click(screen.getByRole('button', { name: 'submit permission set' })) - - expect(mocks.updateAccessRule).toHaveBeenCalledWith( - { - id: 'dataset-rule-1', - name: 'dataset permission', - description: 'dataset description', - permission_keys: ['dataset.acl.edit'], - resourceType: 'dataset', - }, - expect.any(Object), - ) - expect(toast.success).toHaveBeenCalledWith('permission.accessRule.updated') + act(() => { + seedWorkspacePermissionsQuery(queryClient, []) + }) + await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument()) + expect( + screen.queryByRole('button', { name: 'permission.accessRule.newPermissionSet' }), + ).not.toBeInTheDocument() + expect(sent.filter((req) => req.method !== 'GET')).toHaveLength(0) }) }) diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx index 0c3b879227b..6e2a4bbae28 100644 --- a/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx +++ b/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx @@ -1,6 +1,6 @@ 'use client' -import type { AccessPolicy } from '@/models/access-control' +import type { AccessPolicy } from '@dify/contracts/api/console/workspaces/types.gen' import { AlertDialog, AlertDialogActions, @@ -19,12 +19,10 @@ import { } from '@langgenius/dify-ui/dropdown-menu' import { IconButton } from '@langgenius/dify-ui/icon-button' import { toast } from '@langgenius/dify-ui/toast' +import { useMutation } from '@tanstack/react-query' import { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' -import { - useCopyAccessRule, - useDeleteAccessRule, -} from '@/service/access-control/use-workspace-access-rules' +import { consoleQuery } from '@/service/console' type AccessRuleRowMenuProps = { rule: AccessPolicy @@ -37,9 +35,11 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) => const [open, setOpen] = useState(false) const [showDeleteConfirm, setShowDeleteConfirm] = useState(false) - const { mutateAsync: copyAccessRule } = useCopyAccessRule(rule.resource_type) - const { mutateAsync: deleteAccessRule, isPending: isDeletingAccessRule } = useDeleteAccessRule( - rule.resource_type, + const { mutate: copyAccessRule } = useMutation( + consoleQuery.workspaces.current.rbac.accessPolicies.byPolicyId.copy.post.mutationOptions(), + ) + const { mutate: deleteAccessRule, isPending: isDeletingAccessRule } = useMutation( + consoleQuery.workspaces.current.rbac.accessPolicies.byPolicyId.delete.mutationOptions(), ) const handleView = useCallback(() => { @@ -47,12 +47,15 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) => }, [onView]) const handleCopyRules = useCallback(() => { - copyAccessRule(rule.id, { - onSuccess: () => { - toast.success(t(($) => $['accessRule.copied'], { ns: 'permission' })) - setOpen(false) + copyAccessRule( + { params: { policy_id: rule.id } }, + { + onSuccess: () => { + toast.success(t(($) => $['accessRule.copied'], { ns: 'permission' })) + setOpen(false) + }, }, - }) + ) }, [copyAccessRule, rule.id, t]) const openDeleteConfirm = useCallback(() => { @@ -61,12 +64,15 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) => }, []) const handleDelete = useCallback(() => { - deleteAccessRule(rule.id, { - onSuccess: () => { - toast.success(t(($) => $['accessRule.deleted'], { ns: 'permission' })) - setShowDeleteConfirm(false) + deleteAccessRule( + { params: { policy_id: rule.id } }, + { + onSuccess: () => { + toast.success(t(($) => $['accessRule.deleted'], { ns: 'permission' })) + setShowDeleteConfirm(false) + }, }, - }) + ) }, [deleteAccessRule, rule.id, t]) const isBuiltIn = rule.is_builtin diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx index b5a8e7df5a5..cc206d860d5 100644 --- a/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx +++ b/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx @@ -1,18 +1,18 @@ 'use client' -import type { AccessPolicyWithBindings } from '@/models/access-control' +import type { AccessRule } from './types' import { cn } from '@langgenius/dify-ui/cn' import { memo, useCallback } from 'react' import { useTranslation } from 'react-i18next' import AccessRuleRowMenu from './access-rule-row-menu' type AccessRuleRowProps = { - rule: AccessPolicyWithBindings + rule: AccessRule canManage: boolean className?: string showMenu?: boolean - onView?: (rule: AccessPolicyWithBindings) => void - onEdit?: (rule: AccessPolicyWithBindings) => void + onView?: (rule: AccessRule) => void + onEdit?: (rule: AccessRule) => void } const AccessRuleRow = ({ @@ -26,7 +26,7 @@ const AccessRuleRow = ({ const { t } = useTranslation() const { policy } = rule const description = - policy.description.trim() || t(($) => $['accessRule.noDescription'], { ns: 'permission' }) + policy.description?.trim() || t(($) => $['accessRule.noDescription'], { ns: 'permission' }) const handleView = useCallback(() => onView?.(rule), [onView, rule]) const handleEdit = useCallback(() => onEdit?.(rule), [onEdit, rule]) diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx index 67cd0a4cb11..bb9250f9a4b 100644 --- a/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx +++ b/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx @@ -1,6 +1,6 @@ 'use client' -import type { AccessPolicyWithBindings } from '@/models/access-control' +import type { AccessRule } from './types' import { Button } from '@langgenius/dify-ui/button' import { cn } from '@langgenius/dify-ui/cn' import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from '@langgenius/dify-ui/collapsible' @@ -15,7 +15,7 @@ import AccessRuleRow from './access-rule-row' type AccessRuleSectionProps = { title: string - rules: AccessPolicyWithBindings[] + rules: AccessRule[] totalCount?: number isLoadingRules: boolean isFetchingNextPage?: boolean @@ -24,8 +24,9 @@ type AccessRuleSectionProps = { error?: unknown defaultExpanded?: boolean onCreate?: () => void - onViewRule?: (rule: AccessPolicyWithBindings) => void - onEditRule?: (rule: AccessPolicyWithBindings) => void + onViewRule?: (rule: AccessRule) => void + onEditRule?: (rule: AccessRule) => void + onRetry?: () => void className?: string } @@ -42,6 +43,7 @@ const AccessRuleSection = ({ onCreate, onViewRule, onEditRule, + onRetry, className, }: AccessRuleSectionProps) => { const { t } = useTranslation() @@ -144,7 +146,12 @@ const AccessRuleSection = ({ /> } > - {isLoadingRules ? ( + {error ? ( +
+ {t(($) => $['api.actionFailed'], { ns: 'common' })} + +
+ ) : isLoadingRules ? (
diff --git a/web/app/components/header/account-setting/access-rules-page/app-access-rule-section.tsx b/web/app/components/header/account-setting/access-rules-page/app-access-rule-section.tsx deleted file mode 100644 index 93620bbc74a..00000000000 --- a/web/app/components/header/account-setting/access-rules-page/app-access-rule-section.tsx +++ /dev/null @@ -1,161 +0,0 @@ -import type { PermissionSetFormValues, PermissionSetModalMode } from './permission-set-modal' -import type { AccessPolicyWithBindings } from '@/models/access-control' -import { toast } from '@langgenius/dify-ui/toast' -import { useCallback, useMemo, useState } from 'react' -import { useTranslation } from 'react-i18next' -import { useLocale } from '@/context/i18n' -import { getAccessControlTemplateLanguage } from '@/i18n-config/language' -import { - useCreateAccessRule, - useInfiniteWorkspaceAppAccessRules, - useUpdateAccessRule, -} from '@/service/access-control/use-workspace-access-rules' -import AccessRuleSection from './access-rule-section' -import PermissionSetModal from './permission-set-modal' - -type AppAccessRuleSectionProps = { - className?: string -} - -type PermissionSetModalState = { - mode: PermissionSetModalMode - ruleId?: string - initialValues?: PermissionSetFormValues -} - -const RULES_PER_PAGE = 20 - -const AppAccessRuleSection = ({ className }: AppAccessRuleSectionProps) => { - const { t } = useTranslation() - const locale = useLocale() - const [permissionSetModalState, setPermissionSetModalState] = - useState(null) - const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale]) - - const { - data: appAccessRulesResponse, - isLoading, - isFetchingNextPage, - fetchNextPage, - hasNextPage, - error, - } = useInfiniteWorkspaceAppAccessRules({ - page: 1, - limit: RULES_PER_PAGE, - language, - }) - const { mutateAsync: createAccessRule } = useCreateAccessRule() - const { mutateAsync: updateAccessRule } = useUpdateAccessRule() - - const appAccessRules = useMemo( - () => appAccessRulesResponse?.pages.flatMap((page) => page.items) || [], - [appAccessRulesResponse?.pages], - ) - const totalCount = appAccessRulesResponse?.pages[0]?.pagination.total_count || 0 - - const closePermissionSetModal = useCallback(() => { - setPermissionSetModalState(null) - }, []) - - const handleCreate = useCallback(() => { - setPermissionSetModalState({ mode: 'create' }) - }, []) - - const handleView = useCallback((rule: AccessPolicyWithBindings) => { - const { policy } = rule - setPermissionSetModalState({ - mode: 'view', - initialValues: { - name: policy.name, - description: policy.description, - permissionKeys: policy.permission_keys, - }, - }) - }, []) - - const handleEdit = useCallback((rule: AccessPolicyWithBindings) => { - const { policy } = rule - setPermissionSetModalState({ - mode: 'edit', - ruleId: policy.id, - initialValues: { - name: policy.name, - description: policy.description, - permissionKeys: policy.permission_keys, - }, - }) - }, []) - - const handlePermissionSetSubmit = useCallback( - (values: PermissionSetFormValues) => { - if (!permissionSetModalState) return - - const { name, description, permissionKeys } = values - if (permissionSetModalState.mode === 'create') { - createAccessRule( - { - name, - description, - permission_keys: permissionKeys, - resourceType: 'app', - }, - { - onSuccess: () => { - toast.success(t(($) => $['accessRule.created'], { ns: 'permission' })) - closePermissionSetModal() - }, - }, - ) - } else if (permissionSetModalState.mode === 'edit') { - updateAccessRule( - { - id: permissionSetModalState.ruleId!, - name, - description, - permission_keys: permissionKeys, - resourceType: 'app', - }, - { - onSuccess: () => { - toast.success(t(($) => $['accessRule.updated'], { ns: 'permission' })) - closePermissionSetModal() - }, - }, - ) - } - }, - [closePermissionSetModal, createAccessRule, permissionSetModalState, t, updateAccessRule], - ) - - return ( - <> - $['accessRule.appTitle'], { ns: 'permission' })} - rules={appAccessRules} - totalCount={totalCount} - isLoadingRules={isLoading} - isFetchingNextPage={isFetchingNextPage} - hasNextPage={hasNextPage} - fetchNextPage={fetchNextPage} - error={error} - defaultExpanded - onCreate={handleCreate} - onViewRule={handleView} - onEditRule={handleEdit} - className={className} - /> - {permissionSetModalState && ( - - )} - - ) -} - -export default AppAccessRuleSection diff --git a/web/app/components/header/account-setting/access-rules-page/dataset-access-rule-section.tsx b/web/app/components/header/account-setting/access-rules-page/dataset-access-rule-section.tsx deleted file mode 100644 index a0f825f1a95..00000000000 --- a/web/app/components/header/account-setting/access-rules-page/dataset-access-rule-section.tsx +++ /dev/null @@ -1,160 +0,0 @@ -import type { PermissionSetFormValues, PermissionSetModalMode } from './permission-set-modal' -import type { AccessPolicyWithBindings } from '@/models/access-control' -import { toast } from '@langgenius/dify-ui/toast' -import { useCallback, useMemo, useState } from 'react' -import { useTranslation } from 'react-i18next' -import { useLocale } from '@/context/i18n' -import { getAccessControlTemplateLanguage } from '@/i18n-config/language' -import { - useCreateAccessRule, - useInfiniteWorkspaceDatasetAccessRules, - useUpdateAccessRule, -} from '@/service/access-control/use-workspace-access-rules' -import AccessRuleSection from './access-rule-section' -import PermissionSetModal from './permission-set-modal' - -type DatasetAccessRuleSectionProps = { - className?: string -} - -type PermissionSetModalState = { - mode: PermissionSetModalMode - ruleId?: string - initialValues?: PermissionSetFormValues -} - -const RULES_PER_PAGE = 20 - -const DatasetAccessRuleSection = ({ className }: DatasetAccessRuleSectionProps) => { - const { t } = useTranslation() - const locale = useLocale() - const [permissionSetModalState, setPermissionSetModalState] = - useState(null) - const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale]) - - const { - data: datasetAccessRulesResponse, - isLoading, - isFetchingNextPage, - fetchNextPage, - hasNextPage, - error, - } = useInfiniteWorkspaceDatasetAccessRules({ - page: 1, - limit: RULES_PER_PAGE, - language, - }) - const { mutateAsync: createAccessRule } = useCreateAccessRule() - const { mutateAsync: updateAccessRule } = useUpdateAccessRule() - - const datasetAccessRules = useMemo( - () => datasetAccessRulesResponse?.pages.flatMap((page) => page.items) || [], - [datasetAccessRulesResponse?.pages], - ) - const totalCount = datasetAccessRulesResponse?.pages[0]?.pagination.total_count || 0 - - const closePermissionSetModal = useCallback(() => { - setPermissionSetModalState(null) - }, []) - - const handleCreate = useCallback(() => { - setPermissionSetModalState({ mode: 'create' }) - }, []) - - const handleView = useCallback((rule: AccessPolicyWithBindings) => { - const { policy } = rule - setPermissionSetModalState({ - mode: 'view', - initialValues: { - name: policy.name, - description: policy.description, - permissionKeys: policy.permission_keys, - }, - }) - }, []) - - const handleEdit = useCallback((rule: AccessPolicyWithBindings) => { - const { policy } = rule - setPermissionSetModalState({ - mode: 'edit', - ruleId: policy.id, - initialValues: { - name: policy.name, - description: policy.description, - permissionKeys: policy.permission_keys, - }, - }) - }, []) - - const handlePermissionSetSubmit = useCallback( - (values: PermissionSetFormValues) => { - if (!permissionSetModalState) return - - const { name, description, permissionKeys } = values - if (permissionSetModalState.mode === 'create') { - createAccessRule( - { - name, - description, - permission_keys: permissionKeys, - resourceType: 'dataset', - }, - { - onSuccess: () => { - toast.success(t(($) => $['accessRule.created'], { ns: 'permission' })) - closePermissionSetModal() - }, - }, - ) - } else if (permissionSetModalState.mode === 'edit') { - updateAccessRule( - { - id: permissionSetModalState.ruleId!, - name, - description, - permission_keys: permissionKeys, - resourceType: 'dataset', - }, - { - onSuccess: () => { - toast.success(t(($) => $['accessRule.updated'], { ns: 'permission' })) - closePermissionSetModal() - }, - }, - ) - } - }, - [closePermissionSetModal, createAccessRule, permissionSetModalState, t, updateAccessRule], - ) - - return ( - <> - $['accessRule.datasetTitle'], { ns: 'permission' })} - rules={datasetAccessRules} - totalCount={totalCount} - isLoadingRules={isLoading} - isFetchingNextPage={isFetchingNextPage} - hasNextPage={hasNextPage} - fetchNextPage={fetchNextPage} - error={error} - onCreate={handleCreate} - onViewRule={handleView} - onEditRule={handleEdit} - className={className} - /> - {permissionSetModalState && ( - - )} - - ) -} - -export default DatasetAccessRuleSection diff --git a/web/app/components/header/account-setting/access-rules-page/index.tsx b/web/app/components/header/account-setting/access-rules-page/index.tsx index bd8569adc20..ff8e0c5badb 100644 --- a/web/app/components/header/account-setting/access-rules-page/index.tsx +++ b/web/app/components/header/account-setting/access-rules-page/index.tsx @@ -1,13 +1,13 @@ 'use client' -import AppAccessRuleSection from './app-access-rule-section' -import DatasetAccessRuleSection from './dataset-access-rule-section' +import { ResourceAccessRuleSection } from './resource-access-rule-section' const AccessRulesPage = () => { return (
- - + + +
) } diff --git a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx index 8ecc52563de..7ac31c1e9ce 100644 --- a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx +++ b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx @@ -1,8 +1,9 @@ import type { PermissionCatalogResponse } from '@dify/contracts/api/console/workspaces/types.gen' import type { ReactNode } from 'react' import { QueryClientProvider } from '@tanstack/react-query' -import { render, screen } from '@testing-library/react' +import { render, screen, waitFor } from '@testing-library/react' import userEvent from '@testing-library/user-event' +import { AgentPermission } from '@/features/agent-v2/acl' import { consoleQuery } from '@/service/console' import { createTestQueryClient } from '@/test/query-client' import PermissionSetModal from '../index' @@ -77,6 +78,22 @@ const renderModal = (modal: ReactNode) => { datasetPermissionCatalog, ) + queryClient.setQueryData( + consoleQuery.workspaces.current.rbac.rolePermissions.catalog.agent.get.queryKey({ input: {} }), + { + groups: [ + { + group_key: 'agent_acl', + group_name: 'Agent', + description: '', + permissions: Object.values(AgentPermission) + .filter((key) => key !== AgentPermission.Create) + .map((key) => ({ key, name: key, description: '' })), + }, + ], + }, + ) + return render({modal}) } @@ -244,4 +261,49 @@ describe('PermissionSetModal', () => { ).not.toBeInTheDocument() }) }) + it('renders all eleven Agent ACL permissions without the workspace create permission', () => { + renderModal( + , + ) + for (const permission of Object.values(AgentPermission).filter( + (key) => key !== AgentPermission.Create, + )) { + expect( + screen.getByRole('checkbox', { name: getPermissionKeyMatcher(permission) }), + ).toBeInTheDocument() + } + expect(screen.queryByRole('checkbox', { name: /agent.create/ })).not.toBeInTheDocument() + }) + + it('keeps the form open and preserves input after a failed save', async () => { + const close = vi.fn() + const submit = vi.fn().mockRejectedValue(new Error('Unavailable')) + renderModal( + , + ) + await userEvent.type( + screen.getByRole('textbox', { name: /permissionSet.nameLabel/ }), + 'Agent reviewers', + ) + await userEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' })) + await waitFor(() => + expect(screen.getByRole('alert')).toHaveTextContent('common.api.actionFailed'), + ) + expect(screen.getByRole('textbox', { name: /permissionSet.nameLabel/ })).toHaveValue( + 'Agent reviewers', + ) + expect(close).not.toHaveBeenCalled() + }) }) diff --git a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts index 70d4de11fab..37385f954dd 100644 --- a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts +++ b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts @@ -8,13 +8,9 @@ import { consoleQuery } from '@/service/console' export const usePermissionsGroups = (resourceType: AccessPolicyResourceType) => { const { t } = useTranslation() const permissionCatalogQueryOptions = - resourceType === 'app' - ? consoleQuery.workspaces.current.rbac.rolePermissions.catalog.app.get.queryOptions({ - input: {}, - }) - : consoleQuery.workspaces.current.rbac.rolePermissions.catalog.dataset.get.queryOptions({ - input: {}, - }) + consoleQuery.workspaces.current.rbac.rolePermissions.catalog[resourceType].get.queryOptions({ + input: {}, + }) const { data: permissionCatalog } = useQuery(permissionCatalogQueryOptions) const groups = useMemo(() => { diff --git a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx index 049c8eb131a..958b6b71493 100644 --- a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx +++ b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx @@ -31,7 +31,7 @@ type PermissionSetModalProps = { resourceType: AccessPolicyResourceType initialValues?: Partial onClose: () => void - onSubmit: (values: PermissionSetFormValues) => void + onSubmit: (values: PermissionSetFormValues) => void | Promise } type PermissionSetModalBodyProps = Omit @@ -51,19 +51,29 @@ const PermissionSetModalBody = ({ const [permissionKeys, setPermissionKeys] = useState( initialValues?.permissionKeys ?? [], ) + const [isSubmitting, setIsSubmitting] = useState(false) + const [submitFailed, setSubmitFailed] = useState(false) const trimmedName = name.trim() const readonly = mode === 'view' const canSubmit = trimmedName.length > 0 - const handleConfirm = () => { - if (readonly || !canSubmit) return - onSubmit({ - name: trimmedName, - description: description.trim(), - permissionKeys, - }) - onClose() + const handleConfirm = async () => { + if (readonly || !canSubmit || isSubmitting) return + setIsSubmitting(true) + setSubmitFailed(false) + try { + await onSubmit({ + name: trimmedName, + description: description.trim(), + permissionKeys, + }) + onClose() + } catch { + setSubmitFailed(true) + } finally { + setIsSubmitting(false) + } } return ( @@ -71,102 +81,120 @@ const PermissionSetModalBody = ({ className="flex h-[85vh] w-140 flex-col overflow-hidden p-0" backdropProps={{ forceRender: true }} > -
- $['operation.close'], { ns: 'common' })} - size="lg" - className="absolute inset-e-6 top-6" - > - - - } - /> -
- - {t(($) => $[`permissionSet.modal.${mode}.${resourceType}.title`], { ns: 'permission' })} - - - {t(($) => $[`permissionSet.modal.${mode}.${resourceType}.description`], { - ns: 'permission', - })} - -
-
- -
- -
-
- - setName(e.target.value)} - placeholder={t(($) => $['permissionSet.namePlaceholder'], { ns: 'permission' })} - disabled={readonly} +
{ + event.preventDefault() + void handleConfirm() + }} + > +
+ $['operation.close'], { ns: 'common' })} + size="lg" + className="absolute inset-e-6 top-6" + > + + + } /> -
- -
- -