Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(web): align access point permissions (#42648)

Wu Tianwei9a0961a4a9a3
diff --git a/web/app/components/app/access-point/__tests__/built-in-access-points.spec.tsx b/web/app/components/app/access-point/__tests__/built-in-access-points.spec.tsx
index c4ba3dd2d24..661b752dc93 100644
--- a/web/app/components/app/access-point/__tests__/built-in-access-points.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/built-in-access-points.spec.tsx
@@ -180,7 +180,7 @@ describe('BuiltInAccessPoints', () => {
)
expect(mocks.webCard).toHaveBeenCalledWith(
- expect.objectContaining({ canManageAccess: false, canManageAccessPoint: true }),
+ expect.objectContaining({ canManageAccessPoint: true }),
)
expect(mocks.apiCard).toHaveBeenCalledWith(expect.objectContaining({ canManage: true }))
expect(mocks.mcpCard).toHaveBeenCalledWith(
diff --git a/web/app/components/app/access-point/__tests__/deployed-environment-access-points.spec.tsx b/web/app/components/app/access-point/__tests__/deployed-environment-access-points.spec.tsx
index 663731e5e60..70717ba3d89 100644
--- a/web/app/components/app/access-point/__tests__/deployed-environment-access-points.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/deployed-environment-access-points.spec.tsx
@@ -40,7 +40,6 @@ describe('DeployedEnvironmentAccessPoints', () => {
appId="app-1"
environmentId="staging"
canManageAccessPoint
- canReleaseAndVersion
highlightedAccessPoint={highlightedAccessPoint}
/>,
)
@@ -60,7 +59,6 @@ describe('DeployedEnvironmentAccessPoints', () => {
appId="app-1"
environmentId="staging"
canManageAccessPoint
- canReleaseAndVersion
/>,
)
@@ -82,20 +80,18 @@ describe('DeployedEnvironmentAccessPoints', () => {
}
})
- it('passes the Built-in permission split to deployed environment cards', () => {
+ it('passes Access Point management to deployed environment cards', () => {
render(
<DeployedEnvironmentAccessPoints
appId="app-1"
environmentId="staging"
canManageAccessPoint
- canReleaseAndVersion={false}
/>,
)
expect(mocks.webAppCard).toHaveBeenCalledWith(
expect.objectContaining({
canManageAccessPoint: true,
- canReleaseAndVersion: false,
}),
)
expect(mocks.serviceApiCard).toHaveBeenCalledWith(
diff --git a/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx b/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx
index fce4ff54df5..29b0829ce01 100644
--- a/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx
@@ -227,12 +227,7 @@ describe('environment access point cards', () => {
const queryClient = createTestQueryClient()
const card = (environmentId: string) =>
target === 'site' ? (
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId={environmentId}
- canManageAccessPoint
- canReleaseAndVersion
- />
+ <EnvironmentWebAppCard appId="app-1" environmentId={environmentId} canManageAccessPoint />
) : (
<EnvironmentServiceApiCard
appId="app-1"
@@ -262,14 +257,7 @@ describe('environment access point cards', () => {
it('sends a chatflow app to the chat web app shell', async () => {
mockAppMode = 'advanced-chat'
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
expect(await screen.findByText(/environment\/chat\/site-code/)).toHaveTextContent(
'https://site.example.test/environment/chat/site-code',
@@ -277,14 +265,7 @@ describe('environment access point cards', () => {
})
it('renders the real environment Web app URL and workflow actions without Embed', async () => {
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
expect(await screen.findByText(/environment\/workflow\/site-code/)).toHaveTextContent(
'https://site.example.test/environment/workflow/site-code',
@@ -307,14 +288,7 @@ describe('environment access point cards', () => {
access_mode: 'sso_verified',
})
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
expect(
await screen.findByRole('button', {
@@ -327,14 +301,7 @@ describe('environment access point cards', () => {
const pending = createDeferredPromise<typeof site>()
mocks.getSite.mockReturnValue(pending.promise)
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
const card = screen.getByRole('region', { name: /webApp\.title/ })
expect(card).toHaveAttribute('aria-busy', 'true')
@@ -350,14 +317,7 @@ describe('environment access point cards', () => {
it('does not announce the access control placeholder as loading after the Site query fails', async () => {
mocks.getSite.mockRejectedValueOnce(new Error('Site unavailable'))
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
const card = screen.getByRole('region', { name: /webApp\.title/ })
await screen.findAllByText('deployments.health.ENVIRONMENT_STATUS_FAILED')
@@ -366,14 +326,7 @@ describe('environment access point cards', () => {
it('uses environment Site mutations for status and URL reset, and opens its access container', async () => {
const user = userEvent.setup()
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
const accessModeButton = await screen.findByRole('button', {
name: /accessControlDialog\.accessItems\.specific/,
@@ -418,14 +371,7 @@ describe('environment access point cards', () => {
mocks.updateSite
.mockReturnValueOnce(firstToggle.promise)
.mockReturnValueOnce(secondToggle.promise)
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
const accessSwitch = await screen.findByRole('switch')
await user.click(accessSwitch)
@@ -456,14 +402,7 @@ describe('environment access point cards', () => {
it('opens Customize and Settings with environment endpoint data', async () => {
const user = userEvent.setup()
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion={false}
- />,
- )
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
await screen.findByText(/environment\/workflow\/site-code/)
await waitFor(() =>
@@ -480,12 +419,7 @@ describe('environment access point cards', () => {
it('keeps view actions available while disabling deployed Web App management', async () => {
renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint={false}
- canReleaseAndVersion={false}
- />,
+ <EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint={false} />,
)
expect(await screen.findByRole('switch')).toHaveAttribute('aria-disabled', 'true')
@@ -498,15 +432,8 @@ describe('environment access point cards', () => {
expect(screen.getByRole('button', { name: /settings\.settings/ })).toBeDisabled()
})
- it('uses Access Point management for deployed Web App operations without access management', async () => {
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint
- canReleaseAndVersion={false}
- />,
- )
+ it('uses Access Point management for every deployed Web App operation', async () => {
+ renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
expect(await screen.findByRole('switch')).toBeEnabled()
expect(screen.getByRole('button', { name: /regenerate/ })).toBeEnabled()
@@ -514,23 +441,6 @@ describe('environment access point cards', () => {
expect(screen.getByRole('button', { name: /customize\.entry/ })).toBeEnabled(),
)
expect(screen.getByRole('button', { name: /settings\.settings/ })).toBeEnabled()
- expect(
- screen.getByRole('button', { name: /accessControlDialog\.accessItems\.specific/ }),
- ).toBeDisabled()
- })
-
- it('uses Web App access management independently from Access Point management', async () => {
- renderCard(
- <EnvironmentWebAppCard
- appId="app-1"
- environmentId="staging"
- canManageAccessPoint={false}
- canReleaseAndVersion
- />,
- )
-
- expect(await screen.findByRole('switch')).toHaveAttribute('aria-disabled', 'true')
- expect(screen.getByRole('button', { name: /regenerate/ })).toBeDisabled()
expect(
screen.getByRole('button', { name: /accessControlDialog\.accessItems\.specific/ }),
).toBeEnabled()
diff --git a/web/app/components/app/access-point/__tests__/index.spec.tsx b/web/app/components/app/access-point/__tests__/index.spec.tsx
index ee234efb99f..55424d7bc55 100644
--- a/web/app/components/app/access-point/__tests__/index.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/index.spec.tsx
@@ -65,7 +65,6 @@ vi.mock('@/app/components/app/access-point/deployed-environment-access-points',
DeployedEnvironmentAccessPoints: (props: {
appId: string
canManageAccessPoint: boolean
- canReleaseAndVersion: boolean
environmentId: string
highlightedAccessPoint?: AccessPointType
}) => {
@@ -225,7 +224,6 @@ describe('AccessPoint', () => {
expect.objectContaining({
appId: 'app-1',
canManageAccessPoint: false,
- canReleaseAndVersion: false,
environmentId: 'canary',
}),
)
@@ -267,22 +265,21 @@ describe('AccessPoint', () => {
expect(accessPointMocks.deployed).not.toHaveBeenCalled()
})
- it('opens deployed environments with Access Point management independently from deploy', () => {
+ it('does not grant Access Point view from management permission', () => {
appPermissionKeys = [AppACLPermission.AccessPointManage]
renderAccessPoint({ searchParams: '?environment=canary' })
- expect(screen.getByRole('tab', { name: 'Canary' })).toHaveAttribute('aria-selected', 'true')
- expect(accessPointMocks.deployed).toHaveBeenCalledWith(
+ expect(screen.queryByRole('tab')).not.toBeInTheDocument()
+ expect(accessPointMocks.builtIn).toHaveBeenCalledWith(
expect.objectContaining({
canManageAccessPoint: true,
- canReleaseAndVersion: false,
- environmentId: 'canary',
}),
)
+ expect(accessPointMocks.deployed).not.toHaveBeenCalled()
})
- it('passes Web App access management independently from Access Point management', () => {
+ it('does not grant Access Point management from release permission', () => {
appPermissionKeys = [AppACLPermission.AccessPointView, AppACLPermission.ReleaseAndVersion]
renderAccessPoint({ searchParams: '?environment=canary' })
@@ -290,7 +287,6 @@ describe('AccessPoint', () => {
expect(accessPointMocks.deployed).toHaveBeenCalledWith(
expect.objectContaining({
canManageAccessPoint: false,
- canReleaseAndVersion: true,
environmentId: 'canary',
}),
)
diff --git a/web/app/components/app/access-point/__tests__/web-app-card.spec.tsx b/web/app/components/app/access-point/__tests__/web-app-card.spec.tsx
index 6797c7ac99b..64756dedc0f 100644
--- a/web/app/components/app/access-point/__tests__/web-app-card.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/web-app-card.spec.tsx
@@ -183,7 +183,6 @@ function StoreConnectedWebAppCard({
appInfo={appInfo}
availability={availability}
canDeploy
- canManageAccess
canManageAccessPoint={canManageAccessPoint}
showAccessControl={showAccessControl}
onRefreshApp={onRefreshApp}
@@ -544,6 +543,6 @@ describe('WebAppAccessPointCard', () => {
)
expect(
screen.getByRole('button', { name: /accessControlDialog\.accessItems\.anyone/ }),
- ).toBeEnabled()
+ ).toBeDisabled()
})
})
diff --git a/web/app/components/app/access-point/built-in-access-points/index.tsx b/web/app/components/app/access-point/built-in-access-points/index.tsx
index cc48a5af3f0..30c3d99bf27 100644
--- a/web/app/components/app/access-point/built-in-access-points/index.tsx
+++ b/web/app/components/app/access-point/built-in-access-points/index.tsx
@@ -109,7 +109,6 @@ export function BuiltInAccessPoints({
appInfo={appInfo}
availability={appCardAvailability}
canDeploy={canDeploy}
- canManageAccess={canReleaseAndVersion}
canManageAccessPoint={canManageAccessPoint}
showAccessControl={systemFeatures.webapp_auth.enabled}
onRefreshApp={actions.refreshAppDetail}
diff --git a/web/app/components/app/access-point/built-in-access-points/web-app-card.tsx b/web/app/components/app/access-point/built-in-access-points/web-app-card.tsx
index 69a62ec0dc5..f3265e6db6a 100644
--- a/web/app/components/app/access-point/built-in-access-points/web-app-card.tsx
+++ b/web/app/components/app/access-point/built-in-access-points/web-app-card.tsx
@@ -60,7 +60,6 @@ type WebAppAccessPointCardProps = {
appInfo: AccessPointAppInfo
availability: AccessPointAvailability
canDeploy: boolean
- canManageAccess: boolean
canManageAccessPoint: boolean
highlighted?: boolean
showAccessControl: boolean
@@ -73,7 +72,6 @@ export function WebAppAccessPointCard({
appInfo,
availability,
canDeploy,
- canManageAccess,
canManageAccessPoint,
highlighted,
onRefreshApp,
@@ -137,7 +135,7 @@ export function WebAppAccessPointCard({
const { data: accessSubjects } = useAppWhiteListSubjects(
appInfo.id,
showAccessControl &&
- canManageAccess &&
+ canManageAccessPoint &&
appInfo.access_mode === AccessMode.SPECIFIC_GROUPS_MEMBERS,
)
const accessConfigured =
@@ -274,7 +272,7 @@ export function WebAppAccessPointCard({
accessConfigured={accessConfigured}
accessIcon={accessIcon}
accessLabel={t(accessLabel, { ns: 'app' })}
- disabled={!canManageAccess}
+ disabled={!canManageAccessPoint}
onClick={() => setShowAccess(true)}
/>
) : (
diff --git a/web/app/components/app/access-point/deployed-environment-access-points/environment-web-app-card.tsx b/web/app/components/app/access-point/deployed-environment-access-points/environment-web-app-card.tsx
index 95de24e62f8..f6003099544 100644
--- a/web/app/components/app/access-point/deployed-environment-access-points/environment-web-app-card.tsx
+++ b/web/app/components/app/access-point/deployed-environment-access-points/environment-web-app-card.tsx
@@ -44,7 +44,6 @@ type EnvironmentWebAppCardProps = {
appId: string
environmentId: string
canManageAccessPoint: boolean
- canReleaseAndVersion: boolean
highlighted?: boolean
}
@@ -52,7 +51,6 @@ export function EnvironmentWebAppCard({
appId,
environmentId,
canManageAccessPoint,
- canReleaseAndVersion,
highlighted,
}: EnvironmentWebAppCardProps) {
const { t } = useTranslation()
@@ -89,7 +87,7 @@ export function EnvironmentWebAppCard({
...subjectsQueryOptions,
enabled:
siteQuery.isSuccess &&
- canReleaseAndVersion &&
+ canManageAccessPoint &&
(showAccess || accessMode === AccessMode.SPECIFIC_GROUPS_MEMBERS),
})
const accessConfigured =
@@ -235,7 +233,7 @@ export function EnvironmentWebAppCard({
accessConfigured={accessConfigured}
accessIcon={ACCESS_MODE_ICON_MAP[accessMode]}
accessLabel={accessLabel}
- disabled={!canReleaseAndVersion}
+ disabled={!canManageAccessPoint}
onClick={() => setShowAccess(true)}
/>
) : (
@@ -265,7 +263,7 @@ export function EnvironmentWebAppCard({
appId={appId}
environmentId={environmentId}
accessMode={accessMode}
- canManage={canReleaseAndVersion}
+ canManage={canManageAccessPoint}
onClose={() => setShowAccess(false)}
onConfirm={() => setShowAccess(false)}
/>
diff --git a/web/app/components/app/access-point/deployed-environment-access-points/index.tsx b/web/app/components/app/access-point/deployed-environment-access-points/index.tsx
index f585e35aaf4..96cfdbbc78b 100644
--- a/web/app/components/app/access-point/deployed-environment-access-points/index.tsx
+++ b/web/app/components/app/access-point/deployed-environment-access-points/index.tsx
@@ -33,7 +33,6 @@ type DeployedEnvironmentAccessPointsProps = {
appId: string
environmentId: string
canManageAccessPoint: boolean
- canReleaseAndVersion: boolean
highlightedAccessPoint?: AccessPoint | null
}
@@ -41,7 +40,6 @@ export function DeployedEnvironmentAccessPoints({
appId,
environmentId,
canManageAccessPoint,
- canReleaseAndVersion,
highlightedAccessPoint,
}: DeployedEnvironmentAccessPointsProps) {
const { t } = useTranslation()
@@ -70,7 +68,6 @@ export function DeployedEnvironmentAccessPoints({
appId={appId}
environmentId={environmentId}
canManageAccessPoint={canManageAccessPoint}
- canReleaseAndVersion={canReleaseAndVersion}
highlighted={highlightedAccessPoint === 'webApp'}
/>
<EnvironmentServiceApiCard
diff --git a/web/app/components/app/access-point/index.tsx b/web/app/components/app/access-point/index.tsx
index 6aa7750dc16..fb59a07fea1 100644
--- a/web/app/components/app/access-point/index.tsx
+++ b/web/app/components/app/access-point/index.tsx
@@ -135,7 +135,6 @@ function AccessPointContent({
appId={appId}
environmentId={selectedEnvironment}
canManageAccessPoint={canManageAccessPoint}
- canReleaseAndVersion={canReleaseAndVersion}
highlightedAccessPoint={selectedHighlightedAccessPoint}
/>
)}
diff --git a/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx b/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx
index 6b1b5a51a5f..29c06674c15 100644
--- a/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx
+++ b/web/features/agent-v2/agent-detail/access/components/__tests__/access-surface-cards.spec.tsx
@@ -1174,7 +1174,7 @@ describe('Agent access surface cards', () => {
createAgent({
access_mode: 'private_all',
maintainer: 'user-2',
- permission_keys: [AgentPermission.ReleaseAndVersion],
+ permission_keys: [AgentPermission.AccessPointManage],
})
const organizationAccessLabel = 'app.accessControlDialog.accessItems.organization'
@@ -1228,13 +1228,13 @@ describe('Agent access surface cards', () => {
).not.toBeInTheDocument()
})
- it('should disable the access mode entry when the user cannot manage access control', () => {
+ it('should not grant access control management from release permission', () => {
renderWithQueryClient(
<WebAppAccessCard
agent={createAgent({
access_mode: 'private_all',
maintainer: 'user-2',
- permission_keys: [AgentPermission.AccessPointManage],
+ permission_keys: [AgentPermission.ReleaseAndVersion],
})}
agentId="agent-1"
isLoading={false}
@@ -1271,7 +1271,7 @@ describe('Agent access surface cards', () => {
app_id: 'source-app-1',
backing_app_id: 'backing-app-1',
maintainer: 'user-2',
- permission_keys: [AgentPermission.ReleaseAndVersion],
+ permission_keys: [AgentPermission.AccessPointManage],
})}
agentId="agent-1"
isLoading={false}
diff --git a/web/features/agent-v2/agent-detail/access/components/use-web-app-access-control.ts b/web/features/agent-v2/agent-detail/access/components/use-web-app-access-control.ts
index 464c2fda833..9ccb13da3d6 100644
--- a/web/features/agent-v2/agent-detail/access/components/use-web-app-access-control.ts
+++ b/web/features/agent-v2/agent-detail/access/components/use-web-app-access-control.ts
@@ -37,7 +37,7 @@ export function useWebAppAccessControl(
...systemFeaturesQueryOptions(),
select: (systemFeatures) => systemFeatures.webapp_auth.enabled,
})
- const { canReleaseAndVersion: canManage } = getAgentACLCapabilities(agent?.permission_keys)
+ const { canManageAccessPoint: canManage } = getAgentACLCapabilities(agent?.permission_keys)
const hasAccessControl = Boolean(webAppAuthEnabled && appId && accessMode)
const { data: userCanAccessApp, refetch: refetchUserCanAccessApp } = useGetUserCanAccessApp({
appId,
diff --git a/web/features/agent-v2/agent-detail/access/components/web-app-access-card.tsx b/web/features/agent-v2/agent-detail/access/components/web-app-access-card.tsx
index 698de108472..e3b0e568a7a 100644
--- a/web/features/agent-v2/agent-detail/access/components/web-app-access-card.tsx
+++ b/web/features/agent-v2/agent-detail/access/components/web-app-access-card.tsx
@@ -50,9 +50,7 @@ export function WebAppAccessCard({
site?.app_base_url || (typeof window === 'undefined' ? '' : window.location.origin)
const webAppUrl = getAgentWebAppUrl(agent)
const accessReady = Boolean(agent?.access_ready)
- const { canManageAccessPoint, canReleaseAndVersion } = getAgentACLCapabilities(
- agent?.permission_keys,
- )
+ const { canManageAccessPoint } = getAgentACLCapabilities(agent?.permission_keys)
const canManageWebApp = canManageAccessPoint && Boolean(appId && accessReady)
const embeddedConfig =
appId && accessToken
@@ -361,7 +359,7 @@ export function WebAppAccessCard({
webAppRoute="agent"
/>
)}
- {canReleaseAndVersion && showAccessControl && accessControl.state === 'ready' && (
+ {canManageAccessPoint && showAccessControl && accessControl.state === 'ready' && (
<AccessControl
app={accessControl.app}
onClose={() => setShowAccessControl(false)}
diff --git a/web/utils/app-redirection.spec.ts b/web/utils/app-redirection.spec.ts
index 6c13f53417f..a53955d4fa6 100644
--- a/web/utils/app-redirection.spec.ts
+++ b/web/utils/app-redirection.spec.ts
@@ -30,14 +30,14 @@ describe('app-redirection', () => {
expect(getRedirectionPath(app)).toBe('/apps')
})
- it('returns the access point path for Access Point managers', () => {
+ it('does not redirect Access Point managers to a page they cannot view', () => {
const app = {
id: 'app-123',
mode: AppModeEnum.CHAT,
permission_keys: [AppACLPermission.AccessPointManage],
}
- expect(getRedirectionPath(app)).toBe('/app/app-123/access-point')
+ expect(getRedirectionPath(app)).toBe('/apps')
})
it('returns workflow path for workflow mode when app ACL can access layout', () => {
diff --git a/web/utils/permission.spec.ts b/web/utils/permission.spec.ts
index 2545762e568..47e2bf2fc9e 100644
--- a/web/utils/permission.spec.ts
+++ b/web/utils/permission.spec.ts
@@ -50,13 +50,13 @@ describe('permission', () => {
expect(releaseCapabilities.canDeploy).toBe(false)
})
- it('allows Access Point managers to view the page without granting management to viewers', () => {
+ it('keeps Access Point view and management permissions independent', () => {
const viewCapabilities = getAppACLCapabilities([AppACLPermission.AccessPointView])
const manageCapabilities = getAppACLCapabilities([AppACLPermission.AccessPointManage])
expect(viewCapabilities.canViewAccessPoint).toBe(true)
expect(viewCapabilities.canManageAccessPoint).toBe(false)
- expect(manageCapabilities.canViewAccessPoint).toBe(true)
+ expect(manageCapabilities.canViewAccessPoint).toBe(false)
expect(manageCapabilities.canManageAccessPoint).toBe(true)
})
diff --git a/web/utils/permission.ts b/web/utils/permission.ts
index e5c4273fa84..a276b5f02c3 100644
--- a/web/utils/permission.ts
+++ b/web/utils/permission.ts
@@ -137,21 +137,17 @@ export const getAppACLCapabilities = (
AppACLPermission.Edit,
hasMaintainerPermissions,
)
- const canManageAccessPoint = hasResourcePermission(
- permissionKeys,
- AppACLPermission.AccessPointManage,
- hasMaintainerPermissions,
- )
-
return {
- canManageAccessPoint,
- canViewAccessPoint:
- canManageAccessPoint ||
- hasResourcePermission(
- permissionKeys,
- AppACLPermission.AccessPointView,
- hasMaintainerPermissions,
- ),
+ canManageAccessPoint: hasResourcePermission(
+ permissionKeys,
+ AppACLPermission.AccessPointManage,
+ hasMaintainerPermissions,
+ ),
+ canViewAccessPoint: hasResourcePermission(
+ permissionKeys,
+ AppACLPermission.AccessPointView,
+ hasMaintainerPermissions,
+ ),
canViewLayout,
canTestAndRun,
canEdit,