Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(ui): hide OrganizationProfile Security tab when lacking manage enterprise connections permission by iagodahlem · Pull Request #8971 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): hide OrganizationProfile Security tab when lacking manage enterprise connections permission by iagodahlem · Pull Request #8971 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): hide OrganizationProfile Security tab when lacking manage enterprise connections permission by iagodahlem · Pull Request #8971 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(ui): hide OrganizationProfile Security tab when lacking manage enterprise connections permission by iagodahlem · Pull Request #8971 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): hide OrganizationProfile Security tab when lacking manage enterprise connections permission by iagodahlem · Pull Request #8971 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(ui): hide OrganizationProfile Security tab when lacking manage enterprise connections permission by iagodahlem · Pull Request #8971 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(ui): hide OrganizationProfile Security tab when lacking manage enterprise connections permission by iagodahlem · Pull Request #8971 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/olive-pans-sin.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

The Security tab in `<OrganizationProfile />` is now hidden for members who lack the manage enterprise connections permission (`org:sys_entconns:manage`), instead of rendering a permission-denied state. This matches how the Members, Billing, and API keys tabs are gated.
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,8 @@ export const OrganizationProfileNavbar = (
}) || has({ permission: 'org:sys_billing:manage' }),
);

const allowSecurityRoute = useProtect(has => has({ permission: 'org:sys_entconns:manage' }));

const routes = pages.routes
.filter(
r =>
Expand All@@ -40,7 +42,12 @@ export const OrganizationProfileNavbar = (
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING && allowBillingRoutes),
)
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide);
.filter(r => r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS || !apiKeysProps?.hide)
.filter(
r =>
r.id !== ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY ||
(r.id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY && allowSecurityRoute),
);
if (!organization) {
return null;
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,15 +155,17 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
<Protect condition={has => has({ permission: 'org:sys_entconns:manage' })}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
</Route>
</Protect>
) : null}
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,7 +6,6 @@ import { ProfileCard } from '@/ui/elements/ProfileCard';

import { Col, descriptors, Flex, Icon, localizationKeys, SimpleButton, Spinner, Text } from '../../customizables';
import { ChevronLeft } from '../../icons';
import { ConfigureSSOProtect } from '../ConfigureSSO/ConfigureSSO';
import { ConfigureSSOWizard } from '../ConfigureSSO/ConfigureSSOWizard';
import { useOrganizationEnterpriseConnection } from '../ConfigureSSO/hooks/useOrganizationEnterpriseConnection';
import { SecuritySsoSection } from './SecuritySsoSection';
Expand DownExpand Up@@ -50,21 +49,19 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag

if (isLoading) {
return (
<ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
</ConfigureSSOProtect>
<SecurityPageOverview fillHeight>
<Flex
align='center'
justify='center'
sx={t => ({ flex: 1, paddingBlock: t.space.$5 })}
>
<Spinner
size='xs'
colorScheme='neutral'
elementDescriptor={descriptors.spinner}
/>
</Flex>
</SecurityPageOverview>
);
}

Expand All@@ -89,35 +86,31 @@ const OrganizationSecurityPageContent = ({ contentRef }: OrganizationSecurityPag
</SimpleButton>
);

return (
<ConfigureSSOProtect>
{view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
)}
</ConfigureSSOProtect>
return view === 'overview' ? (
<SecurityPageOverview>
<SecuritySsoSection
connection={organizationEnterpriseConnection}
enterpriseConnection={enterpriseConnection}
setConnectionActive={enterpriseConnectionMutations.setConnectionActive}
deleteConnection={enterpriseConnectionMutations.deleteConnection}
organizationName={organization?.name ?? ''}
contentRef={contentRef}
onConfigure={openWizard}
/>
</SecurityPageOverview>
) : (
<ConfigureSSOWizard
organizationEnterpriseConnection={organizationEnterpriseConnection}
testRuns={testRuns}
enterpriseConnection={enterpriseConnection}
contentRef={contentRef}
enterpriseConnectionMutations={enterpriseConnectionMutations}
organizationDomainMutations={organizationDomainMutations}
organizationDomains={organizationDomains}
forceInitialStep={forceFirstStep}
title={backControl}
onExit={exitWizard}
/>
);
};

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,10 +2,11 @@ import type { CustomPage } from '@clerk/shared/types';
import { describe, expect, it } from 'vitest';

import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';
import { render, screen, waitFor } from '@/test/utils';
import { VirtualRouter } from '@/ui/router';

import { OrganizationProfile } from '../';
import { OrganizationSecurityPage } from '../OrganizationSecurityPage';
import { OrganizationProfile } from '..';
import { OrganizationProfileRoutes } from '../OrganizationProfileRoutes';

const { createFixtures } = bindCreateFixtures('OrganizationProfile');

Expand DownExpand Up@@ -538,8 +539,8 @@ describe('OrganizationProfile', () => {
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('includes SSO even when the user does not have the manage enterprise connections permission, but the page surfaces a warning', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
it('does not include SSO when the user lacks the manage enterprise connections permission', async () => {
const { wrapper } = await createFixtures(f => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withOrganizations();
f.withUser({
Expand All@@ -554,17 +555,56 @@ describe('OrganizationProfile', () => {
});
});

fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);
const { queryByText } = render(<OrganizationProfile />, { wrapper });
expect(queryByText('Security')).not.toBeInTheDocument();
});
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Security')).toBeDefined();
describe('SSO route guard', () => {
const SECURITY_DESCRIPTION =
'Require members with a matching email domain to sign in through your identity provider.';

// The navbar tests above only prove the link is hidden. This block exercises the
// route guard wrapping the security route, so direct navigation is blocked too.
// The shared fixture wrapper installs a mocked RouteContext that never matches a
// path, so the guarded sub-route only mounts under a real router seeded to its path.
const renderSecurityRoute = (wrapper: React.ComponentType<{ children?: React.ReactNode }>) =>
render(
<VirtualRouter startPath='/organization-security'>
<OrganizationProfileRoutes contentRef={{ current: null }} />
</VirtualRouter>,
{ wrapper },
);

const withSelfServeSSO = (permissions: string[]) => (f: Parameters<Parameters<typeof createFixtures>[0]>[0]) => {
f.withEnterpriseSso({ selfServeSSO: true });
f.withEmailAddress();
f.withOrganizations();
f.withOrganizationDomains(undefined, 'org:member');
f.withUser({
email_addresses: ['test@clerk.com'],
organization_memberships: [{ name: 'Org1', self_serve_sso_enabled: true, permissions }],
});
};

it('renders the security page on the guarded route when the user can manage enterprise connections', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO(['org:sys_entconns:manage']));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

expect(await screen.findByText(SECURITY_DESCRIPTION)).toBeInTheDocument();
expect(screen.getByRole('button', { name: 'Start configuration' })).toBeInTheDocument();
});

it('blocks the security page on the guarded route when the user lacks the manage enterprise connections permission', async () => {
const { wrapper, fixtures } = await createFixtures(withSelfServeSSO([]));
fixtures.clerk.organization?.getEnterpriseConnections.mockResolvedValue([]);

renderSecurityRoute(wrapper);

cleanup();
render(<OrganizationSecurityPage />, { wrapper });
expect(await screen.findByText(/you do not have permission to manage single sign-on/i)).toBeDefined();
expect(
screen.queryByText(/contact your organization.*administrator to upgrade your permissions/i),
).toBeInTheDocument();
await waitFor(() => expect(screen.queryByText(SECURITY_DESCRIPTION)).not.toBeInTheDocument());
expect(screen.queryByRole('button', { name: 'Start configuration' })).not.toBeInTheDocument();
});
});

Expand Down
Loading