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
8 changes: 8 additions & 0 deletions .changeset/perky-plums-agree.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Rename the `<OrganizationProfile />` SSO page to "Security". The navbar entry is now labeled "Security" with a shield icon, its route path changed from `organization-self-serve-sso` to `organization-security`, and a new `organizationProfile.navbar.security` localization key replaces `organizationProfile.navbar.selfServeSSO`.
2 changes: 1 addition & 1 deletion packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,7 +999,7 @@ export const enUS: LocalizationResource = {
navbar: {
apiKeys: 'API keys',
billing: 'Billing',
selfServeSSO: 'Single Sign-On (SSO)',
security: 'Security',
description: 'Manage your organization.',
general: 'General',
members: 'Members',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1021,7 +1021,7 @@ export type __internal_LocalizationResource = {
members: LocalizationValue;
billing: LocalizationValue;
apiKeys: LocalizationValue;
selfServeSSO: LocalizationValue;
security: LocalizationValue;
};
badge__unverified: LocalizationValue;
badge__automaticInvitation: LocalizationValue;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,9 @@ const OrganizationPaymentAttemptPage = lazy(() =>
})),
);

const OrganizationSelfServeSSOPage = lazy(() =>
import(/* webpackChunkName: "op-self-serve-sso-page"*/ './OrganizationSelfServeSSOPage').then(module => ({
default: module.OrganizationSelfServeSSOPage,
const OrganizationSecurityPage = lazy(() =>
import(/* webpackChunkName: "op-security-page"*/ './OrganizationSecurityPage').then(module => ({
default: module.OrganizationSecurityPage,
})),
);

Expand All@@ -54,7 +54,7 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
apiKeysProps,
Expand DownExpand Up@@ -155,11 +155,11 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{shouldShowSelfServeSSO ? (
{shouldShowSecurityPage ? (

We only have organization.self_serve_sso_enabled for now to determine this, but once we have per org settings such as MFA, etc, we can move this condition to within the page content

<Route path={isSelfServeSsoPageRoot ? undefined : 'organization-self-serve-sso'}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSelfServeSSOPage contentRef={contentRef} />
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@ import { useOrganization } from '@clerk/shared/react';

import { ConfigureSSOContent } from '../ConfigureSSO/ConfigureSSO';

type OrganizationSelfServeSSOPageProps = {
type OrganizationSecurityPageProps = {
contentRef: React.RefObject<HTMLDivElement>;
};

export const OrganizationSelfServeSSOPage = ({ contentRef }: OrganizationSelfServeSSOPageProps) => {
export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPageProps) => {
const { organization } = useOrganization();

if (!organization) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';

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

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

Expand DownExpand Up@@ -495,7 +495,7 @@ describe('OrganizationProfile', () => {
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();
});

it('does not include SSO when disabled at the instance level', async () => {
Expand All@@ -515,7 +515,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('does not include SSO when the org has not opted in, even if the instance has it enabled', async () => {
Expand All@@ -535,7 +535,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
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 () => {
Expand All@@ -557,10 +557,10 @@ describe('OrganizationProfile', () => {
fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();

cleanup();
render(<OrganizationSelfServeSSOPage />, { wrapper });
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),
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ export const ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID = {
MEMBERS: 'members',
BILLING: 'billing',
API_KEYS: 'apiKeys',
SELF_SERVE_SSO: 'selfServeSSO',
SECURITY: 'security',
};

export const USER_BUTTON_ITEM_ID = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/contexts/components/OrganizationProfile.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export type OrganizationProfileContextType = OrganizationProfileCtx & {
isGeneralPageRoot: boolean;
isBillingPageRoot: boolean;
isAPIKeysPageRoot: boolean;
isSelfServeSsoPageRoot: boolean;
isSecurityPageRoot: boolean;
shouldShowBilling: boolean;
shouldShowSelfServeSSO: boolean;
};
Expand DownExpand Up@@ -81,7 +81,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
const isGeneralPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.GENERAL;
const isBillingPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING;
const isAPIKeysPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS;
const isSelfServeSsoPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO;
const isSecurityPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY;
const navigateToGeneralPageRoot = () =>
navigate(isGeneralPageRoot ? '../' : isMembersPageRoot ? './organization-general' : '../organization-general');

Expand All@@ -95,7 +95,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
};
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/src/utils/createCustomPages.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { CustomPage, EnvironmentResource, LoadedClerk } from '@clerk/shared

import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID, USER_PROFILE_NAVBAR_ROUTE_ID } from '../constants';
import type { NavbarRoute } from '../elements/Navbar';
import { Building, Code, Connections, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { Building, Code, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { localizationKeys } from '../localization';
import { ExternalElementMounter } from './ExternalElementMounter';
import { isDevelopmentSDK } from './runtimeEnvironment';
Expand DownExpand Up@@ -52,11 +52,11 @@ type CreateCustomPagesParams = {
getDefaultRoutes: ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}) => GetDefaultRoutesReturnType;
setFirstPathToRoot: (routes: NavbarRoute[]) => NavbarRoute[];
excludedPathsFromDuplicateWarning: string[];
Expand DownExpand Up@@ -118,7 +118,7 @@ const createCustomPages = (
apiKeys: organization
? !disabledOrganizationAPIKeysFeature(clerk, environment)
: !disabledUserAPIKeysFeature(clerk, environment),
selfServeSSO: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
security: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
});

if (isDevelopmentSDK(clerk)) {
Expand DownExpand Up@@ -328,11 +328,11 @@ const getUserProfileDefaultRoutes = ({
const getOrganizationProfileDefaultRoutes = ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}): GetDefaultRoutesReturnType => {
const INITIAL_ROUTES: NavbarRoute[] = [
{
Expand DownExpand Up@@ -364,12 +364,12 @@ const getOrganizationProfileDefaultRoutes = ({
path: 'organization-api-keys',
});
}
if (selfServeSSO) {
if (security) {
INITIAL_ROUTES.push({
name: localizationKeys('organizationProfile.navbar.selfServeSSO'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO,
icon: Connections,
path: 'organization-self-serve-sso',
name: localizationKeys('organizationProfile.navbar.security'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY,
icon: ShieldCheck,
path: 'organization-security',
});
}

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" + '
feat(ui,localizations,shared): rename the organization profile SSO page to Security by iagodahlem · Pull Request #8796 · 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
8 changes: 8 additions & 0 deletions .changeset/perky-plums-agree.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Rename the `<OrganizationProfile />` SSO page to "Security". The navbar entry is now labeled "Security" with a shield icon, its route path changed from `organization-self-serve-sso` to `organization-security`, and a new `organizationProfile.navbar.security` localization key replaces `organizationProfile.navbar.selfServeSSO`.
2 changes: 1 addition & 1 deletion packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,7 +999,7 @@ export const enUS: LocalizationResource = {
navbar: {
apiKeys: 'API keys',
billing: 'Billing',
selfServeSSO: 'Single Sign-On (SSO)',
security: 'Security',
description: 'Manage your organization.',
general: 'General',
members: 'Members',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1021,7 +1021,7 @@ export type __internal_LocalizationResource = {
members: LocalizationValue;
billing: LocalizationValue;
apiKeys: LocalizationValue;
selfServeSSO: LocalizationValue;
security: LocalizationValue;
};
badge__unverified: LocalizationValue;
badge__automaticInvitation: LocalizationValue;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,9 @@ const OrganizationPaymentAttemptPage = lazy(() =>
})),
);

const OrganizationSelfServeSSOPage = lazy(() =>
import(/* webpackChunkName: "op-self-serve-sso-page"*/ './OrganizationSelfServeSSOPage').then(module => ({
default: module.OrganizationSelfServeSSOPage,
const OrganizationSecurityPage = lazy(() =>
import(/* webpackChunkName: "op-security-page"*/ './OrganizationSecurityPage').then(module => ({
default: module.OrganizationSecurityPage,
})),
);

Expand All@@ -54,7 +54,7 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
apiKeysProps,
Expand DownExpand Up@@ -155,11 +155,11 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{shouldShowSelfServeSSO ? (
{shouldShowSecurityPage ? (

We only have organization.self_serve_sso_enabled for now to determine this, but once we have per org settings such as MFA, etc, we can move this condition to within the page content

<Route path={isSelfServeSsoPageRoot ? undefined : 'organization-self-serve-sso'}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSelfServeSSOPage contentRef={contentRef} />
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@ import { useOrganization } from '@clerk/shared/react';

import { ConfigureSSOContent } from '../ConfigureSSO/ConfigureSSO';

type OrganizationSelfServeSSOPageProps = {
type OrganizationSecurityPageProps = {
contentRef: React.RefObject<HTMLDivElement>;
};

export const OrganizationSelfServeSSOPage = ({ contentRef }: OrganizationSelfServeSSOPageProps) => {
export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPageProps) => {
const { organization } = useOrganization();

if (!organization) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';

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

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

Expand DownExpand Up@@ -495,7 +495,7 @@ describe('OrganizationProfile', () => {
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();
});

it('does not include SSO when disabled at the instance level', async () => {
Expand All@@ -515,7 +515,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('does not include SSO when the org has not opted in, even if the instance has it enabled', async () => {
Expand All@@ -535,7 +535,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
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 () => {
Expand All@@ -557,10 +557,10 @@ describe('OrganizationProfile', () => {
fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();

cleanup();
render(<OrganizationSelfServeSSOPage />, { wrapper });
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),
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ export const ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID = {
MEMBERS: 'members',
BILLING: 'billing',
API_KEYS: 'apiKeys',
SELF_SERVE_SSO: 'selfServeSSO',
SECURITY: 'security',
};

export const USER_BUTTON_ITEM_ID = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/contexts/components/OrganizationProfile.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export type OrganizationProfileContextType = OrganizationProfileCtx & {
isGeneralPageRoot: boolean;
isBillingPageRoot: boolean;
isAPIKeysPageRoot: boolean;
isSelfServeSsoPageRoot: boolean;
isSecurityPageRoot: boolean;
shouldShowBilling: boolean;
shouldShowSelfServeSSO: boolean;
};
Expand DownExpand Up@@ -81,7 +81,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
const isGeneralPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.GENERAL;
const isBillingPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING;
const isAPIKeysPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS;
const isSelfServeSsoPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO;
const isSecurityPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY;
const navigateToGeneralPageRoot = () =>
navigate(isGeneralPageRoot ? '../' : isMembersPageRoot ? './organization-general' : '../organization-general');

Expand All@@ -95,7 +95,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
};
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/src/utils/createCustomPages.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { CustomPage, EnvironmentResource, LoadedClerk } from '@clerk/shared

import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID, USER_PROFILE_NAVBAR_ROUTE_ID } from '../constants';
import type { NavbarRoute } from '../elements/Navbar';
import { Building, Code, Connections, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { Building, Code, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { localizationKeys } from '../localization';
import { ExternalElementMounter } from './ExternalElementMounter';
import { isDevelopmentSDK } from './runtimeEnvironment';
Expand DownExpand Up@@ -52,11 +52,11 @@ type CreateCustomPagesParams = {
getDefaultRoutes: ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}) => GetDefaultRoutesReturnType;
setFirstPathToRoot: (routes: NavbarRoute[]) => NavbarRoute[];
excludedPathsFromDuplicateWarning: string[];
Expand DownExpand Up@@ -118,7 +118,7 @@ const createCustomPages = (
apiKeys: organization
? !disabledOrganizationAPIKeysFeature(clerk, environment)
: !disabledUserAPIKeysFeature(clerk, environment),
selfServeSSO: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
security: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
});

if (isDevelopmentSDK(clerk)) {
Expand DownExpand Up@@ -328,11 +328,11 @@ const getUserProfileDefaultRoutes = ({
const getOrganizationProfileDefaultRoutes = ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}): GetDefaultRoutesReturnType => {
const INITIAL_ROUTES: NavbarRoute[] = [
{
Expand DownExpand Up@@ -364,12 +364,12 @@ const getOrganizationProfileDefaultRoutes = ({
path: 'organization-api-keys',
});
}
if (selfServeSSO) {
if (security) {
INITIAL_ROUTES.push({
name: localizationKeys('organizationProfile.navbar.selfServeSSO'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO,
icon: Connections,
path: 'organization-self-serve-sso',
name: localizationKeys('organizationProfile.navbar.security'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY,
icon: ShieldCheck,
path: 'organization-security',
});
}

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('^' + ".*" + ' feat(ui,localizations,shared): rename the organization profile SSO page to Security by iagodahlem · Pull Request #8796 · 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
8 changes: 8 additions & 0 deletions .changeset/perky-plums-agree.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Rename the `<OrganizationProfile />` SSO page to "Security". The navbar entry is now labeled "Security" with a shield icon, its route path changed from `organization-self-serve-sso` to `organization-security`, and a new `organizationProfile.navbar.security` localization key replaces `organizationProfile.navbar.selfServeSSO`.
2 changes: 1 addition & 1 deletion packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,7 +999,7 @@ export const enUS: LocalizationResource = {
navbar: {
apiKeys: 'API keys',
billing: 'Billing',
selfServeSSO: 'Single Sign-On (SSO)',
security: 'Security',
description: 'Manage your organization.',
general: 'General',
members: 'Members',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1021,7 +1021,7 @@ export type __internal_LocalizationResource = {
members: LocalizationValue;
billing: LocalizationValue;
apiKeys: LocalizationValue;
selfServeSSO: LocalizationValue;
security: LocalizationValue;
};
badge__unverified: LocalizationValue;
badge__automaticInvitation: LocalizationValue;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,9 @@ const OrganizationPaymentAttemptPage = lazy(() =>
})),
);

const OrganizationSelfServeSSOPage = lazy(() =>
import(/* webpackChunkName: "op-self-serve-sso-page"*/ './OrganizationSelfServeSSOPage').then(module => ({
default: module.OrganizationSelfServeSSOPage,
const OrganizationSecurityPage = lazy(() =>
import(/* webpackChunkName: "op-security-page"*/ './OrganizationSecurityPage').then(module => ({
default: module.OrganizationSecurityPage,
})),
);

Expand All@@ -54,7 +54,7 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
apiKeysProps,
Expand DownExpand Up@@ -155,11 +155,11 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{shouldShowSelfServeSSO ? (
{shouldShowSecurityPage ? (

We only have organization.self_serve_sso_enabled for now to determine this, but once we have per org settings such as MFA, etc, we can move this condition to within the page content

<Route path={isSelfServeSsoPageRoot ? undefined : 'organization-self-serve-sso'}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSelfServeSSOPage contentRef={contentRef} />
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@ import { useOrganization } from '@clerk/shared/react';

import { ConfigureSSOContent } from '../ConfigureSSO/ConfigureSSO';

type OrganizationSelfServeSSOPageProps = {
type OrganizationSecurityPageProps = {
contentRef: React.RefObject<HTMLDivElement>;
};

export const OrganizationSelfServeSSOPage = ({ contentRef }: OrganizationSelfServeSSOPageProps) => {
export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPageProps) => {
const { organization } = useOrganization();

if (!organization) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';

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

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

Expand DownExpand Up@@ -495,7 +495,7 @@ describe('OrganizationProfile', () => {
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();
});

it('does not include SSO when disabled at the instance level', async () => {
Expand All@@ -515,7 +515,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('does not include SSO when the org has not opted in, even if the instance has it enabled', async () => {
Expand All@@ -535,7 +535,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
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 () => {
Expand All@@ -557,10 +557,10 @@ describe('OrganizationProfile', () => {
fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();

cleanup();
render(<OrganizationSelfServeSSOPage />, { wrapper });
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),
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ export const ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID = {
MEMBERS: 'members',
BILLING: 'billing',
API_KEYS: 'apiKeys',
SELF_SERVE_SSO: 'selfServeSSO',
SECURITY: 'security',
};

export const USER_BUTTON_ITEM_ID = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/contexts/components/OrganizationProfile.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export type OrganizationProfileContextType = OrganizationProfileCtx & {
isGeneralPageRoot: boolean;
isBillingPageRoot: boolean;
isAPIKeysPageRoot: boolean;
isSelfServeSsoPageRoot: boolean;
isSecurityPageRoot: boolean;
shouldShowBilling: boolean;
shouldShowSelfServeSSO: boolean;
};
Expand DownExpand Up@@ -81,7 +81,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
const isGeneralPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.GENERAL;
const isBillingPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING;
const isAPIKeysPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS;
const isSelfServeSsoPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO;
const isSecurityPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY;
const navigateToGeneralPageRoot = () =>
navigate(isGeneralPageRoot ? '../' : isMembersPageRoot ? './organization-general' : '../organization-general');

Expand All@@ -95,7 +95,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
};
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/src/utils/createCustomPages.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { CustomPage, EnvironmentResource, LoadedClerk } from '@clerk/shared

import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID, USER_PROFILE_NAVBAR_ROUTE_ID } from '../constants';
import type { NavbarRoute } from '../elements/Navbar';
import { Building, Code, Connections, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { Building, Code, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { localizationKeys } from '../localization';
import { ExternalElementMounter } from './ExternalElementMounter';
import { isDevelopmentSDK } from './runtimeEnvironment';
Expand DownExpand Up@@ -52,11 +52,11 @@ type CreateCustomPagesParams = {
getDefaultRoutes: ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}) => GetDefaultRoutesReturnType;
setFirstPathToRoot: (routes: NavbarRoute[]) => NavbarRoute[];
excludedPathsFromDuplicateWarning: string[];
Expand DownExpand Up@@ -118,7 +118,7 @@ const createCustomPages = (
apiKeys: organization
? !disabledOrganizationAPIKeysFeature(clerk, environment)
: !disabledUserAPIKeysFeature(clerk, environment),
selfServeSSO: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
security: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
});

if (isDevelopmentSDK(clerk)) {
Expand DownExpand Up@@ -328,11 +328,11 @@ const getUserProfileDefaultRoutes = ({
const getOrganizationProfileDefaultRoutes = ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}): GetDefaultRoutesReturnType => {
const INITIAL_ROUTES: NavbarRoute[] = [
{
Expand DownExpand Up@@ -364,12 +364,12 @@ const getOrganizationProfileDefaultRoutes = ({
path: 'organization-api-keys',
});
}
if (selfServeSSO) {
if (security) {
INITIAL_ROUTES.push({
name: localizationKeys('organizationProfile.navbar.selfServeSSO'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO,
icon: Connections,
path: 'organization-self-serve-sso',
name: localizationKeys('organizationProfile.navbar.security'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY,
icon: ShieldCheck,
path: 'organization-security',
});
}

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('^' + ".*" + ' feat(ui,localizations,shared): rename the organization profile SSO page to Security by iagodahlem · Pull Request #8796 · 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
8 changes: 8 additions & 0 deletions .changeset/perky-plums-agree.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Rename the `<OrganizationProfile />` SSO page to "Security". The navbar entry is now labeled "Security" with a shield icon, its route path changed from `organization-self-serve-sso` to `organization-security`, and a new `organizationProfile.navbar.security` localization key replaces `organizationProfile.navbar.selfServeSSO`.
2 changes: 1 addition & 1 deletion packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,7 +999,7 @@ export const enUS: LocalizationResource = {
navbar: {
apiKeys: 'API keys',
billing: 'Billing',
selfServeSSO: 'Single Sign-On (SSO)',
security: 'Security',
description: 'Manage your organization.',
general: 'General',
members: 'Members',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1021,7 +1021,7 @@ export type __internal_LocalizationResource = {
members: LocalizationValue;
billing: LocalizationValue;
apiKeys: LocalizationValue;
selfServeSSO: LocalizationValue;
security: LocalizationValue;
};
badge__unverified: LocalizationValue;
badge__automaticInvitation: LocalizationValue;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,9 @@ const OrganizationPaymentAttemptPage = lazy(() =>
})),
);

const OrganizationSelfServeSSOPage = lazy(() =>
import(/* webpackChunkName: "op-self-serve-sso-page"*/ './OrganizationSelfServeSSOPage').then(module => ({
default: module.OrganizationSelfServeSSOPage,
const OrganizationSecurityPage = lazy(() =>
import(/* webpackChunkName: "op-security-page"*/ './OrganizationSecurityPage').then(module => ({
default: module.OrganizationSecurityPage,
})),
);

Expand All@@ -54,7 +54,7 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
apiKeysProps,
Expand DownExpand Up@@ -155,11 +155,11 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{shouldShowSelfServeSSO ? (
{shouldShowSecurityPage ? (

We only have organization.self_serve_sso_enabled for now to determine this, but once we have per org settings such as MFA, etc, we can move this condition to within the page content

<Route path={isSelfServeSsoPageRoot ? undefined : 'organization-self-serve-sso'}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSelfServeSSOPage contentRef={contentRef} />
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@ import { useOrganization } from '@clerk/shared/react';

import { ConfigureSSOContent } from '../ConfigureSSO/ConfigureSSO';

type OrganizationSelfServeSSOPageProps = {
type OrganizationSecurityPageProps = {
contentRef: React.RefObject<HTMLDivElement>;
};

export const OrganizationSelfServeSSOPage = ({ contentRef }: OrganizationSelfServeSSOPageProps) => {
export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPageProps) => {
const { organization } = useOrganization();

if (!organization) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';

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

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

Expand DownExpand Up@@ -495,7 +495,7 @@ describe('OrganizationProfile', () => {
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();
});

it('does not include SSO when disabled at the instance level', async () => {
Expand All@@ -515,7 +515,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('does not include SSO when the org has not opted in, even if the instance has it enabled', async () => {
Expand All@@ -535,7 +535,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
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 () => {
Expand All@@ -557,10 +557,10 @@ describe('OrganizationProfile', () => {
fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();

cleanup();
render(<OrganizationSelfServeSSOPage />, { wrapper });
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),
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ export const ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID = {
MEMBERS: 'members',
BILLING: 'billing',
API_KEYS: 'apiKeys',
SELF_SERVE_SSO: 'selfServeSSO',
SECURITY: 'security',
};

export const USER_BUTTON_ITEM_ID = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/contexts/components/OrganizationProfile.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export type OrganizationProfileContextType = OrganizationProfileCtx & {
isGeneralPageRoot: boolean;
isBillingPageRoot: boolean;
isAPIKeysPageRoot: boolean;
isSelfServeSsoPageRoot: boolean;
isSecurityPageRoot: boolean;
shouldShowBilling: boolean;
shouldShowSelfServeSSO: boolean;
};
Expand DownExpand Up@@ -81,7 +81,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
const isGeneralPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.GENERAL;
const isBillingPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING;
const isAPIKeysPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS;
const isSelfServeSsoPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO;
const isSecurityPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY;
const navigateToGeneralPageRoot = () =>
navigate(isGeneralPageRoot ? '../' : isMembersPageRoot ? './organization-general' : '../organization-general');

Expand All@@ -95,7 +95,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
};
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/src/utils/createCustomPages.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { CustomPage, EnvironmentResource, LoadedClerk } from '@clerk/shared

import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID, USER_PROFILE_NAVBAR_ROUTE_ID } from '../constants';
import type { NavbarRoute } from '../elements/Navbar';
import { Building, Code, Connections, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { Building, Code, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { localizationKeys } from '../localization';
import { ExternalElementMounter } from './ExternalElementMounter';
import { isDevelopmentSDK } from './runtimeEnvironment';
Expand DownExpand Up@@ -52,11 +52,11 @@ type CreateCustomPagesParams = {
getDefaultRoutes: ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}) => GetDefaultRoutesReturnType;
setFirstPathToRoot: (routes: NavbarRoute[]) => NavbarRoute[];
excludedPathsFromDuplicateWarning: string[];
Expand DownExpand Up@@ -118,7 +118,7 @@ const createCustomPages = (
apiKeys: organization
? !disabledOrganizationAPIKeysFeature(clerk, environment)
: !disabledUserAPIKeysFeature(clerk, environment),
selfServeSSO: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
security: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
});

if (isDevelopmentSDK(clerk)) {
Expand DownExpand Up@@ -328,11 +328,11 @@ const getUserProfileDefaultRoutes = ({
const getOrganizationProfileDefaultRoutes = ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}): GetDefaultRoutesReturnType => {
const INITIAL_ROUTES: NavbarRoute[] = [
{
Expand DownExpand Up@@ -364,12 +364,12 @@ const getOrganizationProfileDefaultRoutes = ({
path: 'organization-api-keys',
});
}
if (selfServeSSO) {
if (security) {
INITIAL_ROUTES.push({
name: localizationKeys('organizationProfile.navbar.selfServeSSO'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO,
icon: Connections,
path: 'organization-self-serve-sso',
name: localizationKeys('organizationProfile.navbar.security'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY,
icon: ShieldCheck,
path: 'organization-security',
});
}

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" + ' feat(ui,localizations,shared): rename the organization profile SSO page to Security by iagodahlem · Pull Request #8796 · 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
8 changes: 8 additions & 0 deletions .changeset/perky-plums-agree.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Rename the `<OrganizationProfile />` SSO page to "Security". The navbar entry is now labeled "Security" with a shield icon, its route path changed from `organization-self-serve-sso` to `organization-security`, and a new `organizationProfile.navbar.security` localization key replaces `organizationProfile.navbar.selfServeSSO`.
2 changes: 1 addition & 1 deletion packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,7 +999,7 @@ export const enUS: LocalizationResource = {
navbar: {
apiKeys: 'API keys',
billing: 'Billing',
selfServeSSO: 'Single Sign-On (SSO)',
security: 'Security',
description: 'Manage your organization.',
general: 'General',
members: 'Members',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1021,7 +1021,7 @@ export type __internal_LocalizationResource = {
members: LocalizationValue;
billing: LocalizationValue;
apiKeys: LocalizationValue;
selfServeSSO: LocalizationValue;
security: LocalizationValue;
};
badge__unverified: LocalizationValue;
badge__automaticInvitation: LocalizationValue;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,9 @@ const OrganizationPaymentAttemptPage = lazy(() =>
})),
);

const OrganizationSelfServeSSOPage = lazy(() =>
import(/* webpackChunkName: "op-self-serve-sso-page"*/ './OrganizationSelfServeSSOPage').then(module => ({
default: module.OrganizationSelfServeSSOPage,
const OrganizationSecurityPage = lazy(() =>
import(/* webpackChunkName: "op-security-page"*/ './OrganizationSecurityPage').then(module => ({
default: module.OrganizationSecurityPage,
})),
);

Expand All@@ -54,7 +54,7 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
apiKeysProps,
Expand DownExpand Up@@ -155,11 +155,11 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{shouldShowSelfServeSSO ? (
{shouldShowSecurityPage ? (

We only have organization.self_serve_sso_enabled for now to determine this, but once we have per org settings such as MFA, etc, we can move this condition to within the page content

<Route path={isSelfServeSsoPageRoot ? undefined : 'organization-self-serve-sso'}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSelfServeSSOPage contentRef={contentRef} />
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@ import { useOrganization } from '@clerk/shared/react';

import { ConfigureSSOContent } from '../ConfigureSSO/ConfigureSSO';

type OrganizationSelfServeSSOPageProps = {
type OrganizationSecurityPageProps = {
contentRef: React.RefObject<HTMLDivElement>;
};

export const OrganizationSelfServeSSOPage = ({ contentRef }: OrganizationSelfServeSSOPageProps) => {
export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPageProps) => {
const { organization } = useOrganization();

if (!organization) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';

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

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

Expand DownExpand Up@@ -495,7 +495,7 @@ describe('OrganizationProfile', () => {
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();
});

it('does not include SSO when disabled at the instance level', async () => {
Expand All@@ -515,7 +515,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('does not include SSO when the org has not opted in, even if the instance has it enabled', async () => {
Expand All@@ -535,7 +535,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
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 () => {
Expand All@@ -557,10 +557,10 @@ describe('OrganizationProfile', () => {
fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();

cleanup();
render(<OrganizationSelfServeSSOPage />, { wrapper });
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),
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ export const ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID = {
MEMBERS: 'members',
BILLING: 'billing',
API_KEYS: 'apiKeys',
SELF_SERVE_SSO: 'selfServeSSO',
SECURITY: 'security',
};

export const USER_BUTTON_ITEM_ID = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/contexts/components/OrganizationProfile.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export type OrganizationProfileContextType = OrganizationProfileCtx & {
isGeneralPageRoot: boolean;
isBillingPageRoot: boolean;
isAPIKeysPageRoot: boolean;
isSelfServeSsoPageRoot: boolean;
isSecurityPageRoot: boolean;
shouldShowBilling: boolean;
shouldShowSelfServeSSO: boolean;
};
Expand DownExpand Up@@ -81,7 +81,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
const isGeneralPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.GENERAL;
const isBillingPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING;
const isAPIKeysPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS;
const isSelfServeSsoPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO;
const isSecurityPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY;
const navigateToGeneralPageRoot = () =>
navigate(isGeneralPageRoot ? '../' : isMembersPageRoot ? './organization-general' : '../organization-general');

Expand All@@ -95,7 +95,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
};
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/src/utils/createCustomPages.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { CustomPage, EnvironmentResource, LoadedClerk } from '@clerk/shared

import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID, USER_PROFILE_NAVBAR_ROUTE_ID } from '../constants';
import type { NavbarRoute } from '../elements/Navbar';
import { Building, Code, Connections, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { Building, Code, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { localizationKeys } from '../localization';
import { ExternalElementMounter } from './ExternalElementMounter';
import { isDevelopmentSDK } from './runtimeEnvironment';
Expand DownExpand Up@@ -52,11 +52,11 @@ type CreateCustomPagesParams = {
getDefaultRoutes: ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}) => GetDefaultRoutesReturnType;
setFirstPathToRoot: (routes: NavbarRoute[]) => NavbarRoute[];
excludedPathsFromDuplicateWarning: string[];
Expand DownExpand Up@@ -118,7 +118,7 @@ const createCustomPages = (
apiKeys: organization
? !disabledOrganizationAPIKeysFeature(clerk, environment)
: !disabledUserAPIKeysFeature(clerk, environment),
selfServeSSO: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
security: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
});

if (isDevelopmentSDK(clerk)) {
Expand DownExpand Up@@ -328,11 +328,11 @@ const getUserProfileDefaultRoutes = ({
const getOrganizationProfileDefaultRoutes = ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}): GetDefaultRoutesReturnType => {
const INITIAL_ROUTES: NavbarRoute[] = [
{
Expand DownExpand Up@@ -364,12 +364,12 @@ const getOrganizationProfileDefaultRoutes = ({
path: 'organization-api-keys',
});
}
if (selfServeSSO) {
if (security) {
INITIAL_ROUTES.push({
name: localizationKeys('organizationProfile.navbar.selfServeSSO'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO,
icon: Connections,
path: 'organization-self-serve-sso',
name: localizationKeys('organizationProfile.navbar.security'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY,
icon: ShieldCheck,
path: 'organization-security',
});
}

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('^' + ".*" + ' feat(ui,localizations,shared): rename the organization profile SSO page to Security by iagodahlem · Pull Request #8796 · 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
8 changes: 8 additions & 0 deletions .changeset/perky-plums-agree.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Rename the `<OrganizationProfile />` SSO page to "Security". The navbar entry is now labeled "Security" with a shield icon, its route path changed from `organization-self-serve-sso` to `organization-security`, and a new `organizationProfile.navbar.security` localization key replaces `organizationProfile.navbar.selfServeSSO`.
2 changes: 1 addition & 1 deletion packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,7 +999,7 @@ export const enUS: LocalizationResource = {
navbar: {
apiKeys: 'API keys',
billing: 'Billing',
selfServeSSO: 'Single Sign-On (SSO)',
security: 'Security',
description: 'Manage your organization.',
general: 'General',
members: 'Members',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1021,7 +1021,7 @@ export type __internal_LocalizationResource = {
members: LocalizationValue;
billing: LocalizationValue;
apiKeys: LocalizationValue;
selfServeSSO: LocalizationValue;
security: LocalizationValue;
};
badge__unverified: LocalizationValue;
badge__automaticInvitation: LocalizationValue;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,9 @@ const OrganizationPaymentAttemptPage = lazy(() =>
})),
);

const OrganizationSelfServeSSOPage = lazy(() =>
import(/* webpackChunkName: "op-self-serve-sso-page"*/ './OrganizationSelfServeSSOPage').then(module => ({
default: module.OrganizationSelfServeSSOPage,
const OrganizationSecurityPage = lazy(() =>
import(/* webpackChunkName: "op-security-page"*/ './OrganizationSecurityPage').then(module => ({
default: module.OrganizationSecurityPage,
})),
);

Expand All@@ -54,7 +54,7 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
apiKeysProps,
Expand DownExpand Up@@ -155,11 +155,11 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{shouldShowSelfServeSSO ? (
{shouldShowSecurityPage ? (

We only have organization.self_serve_sso_enabled for now to determine this, but once we have per org settings such as MFA, etc, we can move this condition to within the page content

<Route path={isSelfServeSsoPageRoot ? undefined : 'organization-self-serve-sso'}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSelfServeSSOPage contentRef={contentRef} />
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@ import { useOrganization } from '@clerk/shared/react';

import { ConfigureSSOContent } from '../ConfigureSSO/ConfigureSSO';

type OrganizationSelfServeSSOPageProps = {
type OrganizationSecurityPageProps = {
contentRef: React.RefObject<HTMLDivElement>;
};

export const OrganizationSelfServeSSOPage = ({ contentRef }: OrganizationSelfServeSSOPageProps) => {
export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPageProps) => {
const { organization } = useOrganization();

if (!organization) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';

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

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

Expand DownExpand Up@@ -495,7 +495,7 @@ describe('OrganizationProfile', () => {
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();
});

it('does not include SSO when disabled at the instance level', async () => {
Expand All@@ -515,7 +515,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('does not include SSO when the org has not opted in, even if the instance has it enabled', async () => {
Expand All@@ -535,7 +535,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
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 () => {
Expand All@@ -557,10 +557,10 @@ describe('OrganizationProfile', () => {
fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();

cleanup();
render(<OrganizationSelfServeSSOPage />, { wrapper });
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),
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ export const ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID = {
MEMBERS: 'members',
BILLING: 'billing',
API_KEYS: 'apiKeys',
SELF_SERVE_SSO: 'selfServeSSO',
SECURITY: 'security',
};

export const USER_BUTTON_ITEM_ID = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/contexts/components/OrganizationProfile.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export type OrganizationProfileContextType = OrganizationProfileCtx & {
isGeneralPageRoot: boolean;
isBillingPageRoot: boolean;
isAPIKeysPageRoot: boolean;
isSelfServeSsoPageRoot: boolean;
isSecurityPageRoot: boolean;
shouldShowBilling: boolean;
shouldShowSelfServeSSO: boolean;
};
Expand DownExpand Up@@ -81,7 +81,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
const isGeneralPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.GENERAL;
const isBillingPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING;
const isAPIKeysPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS;
const isSelfServeSsoPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO;
const isSecurityPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY;
const navigateToGeneralPageRoot = () =>
navigate(isGeneralPageRoot ? '../' : isMembersPageRoot ? './organization-general' : '../organization-general');

Expand All@@ -95,7 +95,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
};
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/src/utils/createCustomPages.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { CustomPage, EnvironmentResource, LoadedClerk } from '@clerk/shared

import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID, USER_PROFILE_NAVBAR_ROUTE_ID } from '../constants';
import type { NavbarRoute } from '../elements/Navbar';
import { Building, Code, Connections, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { Building, Code, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { localizationKeys } from '../localization';
import { ExternalElementMounter } from './ExternalElementMounter';
import { isDevelopmentSDK } from './runtimeEnvironment';
Expand DownExpand Up@@ -52,11 +52,11 @@ type CreateCustomPagesParams = {
getDefaultRoutes: ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}) => GetDefaultRoutesReturnType;
setFirstPathToRoot: (routes: NavbarRoute[]) => NavbarRoute[];
excludedPathsFromDuplicateWarning: string[];
Expand DownExpand Up@@ -118,7 +118,7 @@ const createCustomPages = (
apiKeys: organization
? !disabledOrganizationAPIKeysFeature(clerk, environment)
: !disabledUserAPIKeysFeature(clerk, environment),
selfServeSSO: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
security: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
});

if (isDevelopmentSDK(clerk)) {
Expand DownExpand Up@@ -328,11 +328,11 @@ const getUserProfileDefaultRoutes = ({
const getOrganizationProfileDefaultRoutes = ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}): GetDefaultRoutesReturnType => {
const INITIAL_ROUTES: NavbarRoute[] = [
{
Expand DownExpand Up@@ -364,12 +364,12 @@ const getOrganizationProfileDefaultRoutes = ({
path: 'organization-api-keys',
});
}
if (selfServeSSO) {
if (security) {
INITIAL_ROUTES.push({
name: localizationKeys('organizationProfile.navbar.selfServeSSO'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO,
icon: Connections,
path: 'organization-self-serve-sso',
name: localizationKeys('organizationProfile.navbar.security'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY,
icon: ShieldCheck,
path: 'organization-security',
});
}

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); } })(); })(); feat(ui,localizations,shared): rename the organization profile SSO page to Security by iagodahlem · Pull Request #8796 · 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
8 changes: 8 additions & 0 deletions .changeset/perky-plums-agree.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
'@clerk/shared': patch
'@clerk/ui': patch
---

Rename the `<OrganizationProfile />` SSO page to "Security". The navbar entry is now labeled "Security" with a shield icon, its route path changed from `organization-self-serve-sso` to `organization-security`, and a new `organizationProfile.navbar.security` localization key replaces `organizationProfile.navbar.selfServeSSO`.
2 changes: 1 addition & 1 deletion packages/localizations/src/en-US.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -999,7 +999,7 @@ export const enUS: LocalizationResource = {
navbar: {
apiKeys: 'API keys',
billing: 'Billing',
selfServeSSO: 'Single Sign-On (SSO)',
security: 'Security',
description: 'Manage your organization.',
general: 'General',
members: 'Members',
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/types/localization.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -1021,7 +1021,7 @@ export type __internal_LocalizationResource = {
members: LocalizationValue;
billing: LocalizationValue;
apiKeys: LocalizationValue;
selfServeSSO: LocalizationValue;
security: LocalizationValue;
};
badge__unverified: LocalizationValue;
badge__automaticInvitation: LocalizationValue;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,9 +37,9 @@ const OrganizationPaymentAttemptPage = lazy(() =>
})),
);

const OrganizationSelfServeSSOPage = lazy(() =>
import(/* webpackChunkName: "op-self-serve-sso-page"*/ './OrganizationSelfServeSSOPage').then(module => ({
default: module.OrganizationSelfServeSSOPage,
const OrganizationSecurityPage = lazy(() =>
import(/* webpackChunkName: "op-security-page"*/ './OrganizationSecurityPage').then(module => ({
default: module.OrganizationSecurityPage,
})),
);

Expand All@@ -54,7 +54,7 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
apiKeysProps,
Expand DownExpand Up@@ -155,11 +155,11 @@ export const OrganizationProfileRoutes = ({ contentRef }: OrganizationProfileRou
</Protect>
)}
{shouldShowSelfServeSSO ? (

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{shouldShowSelfServeSSO ? (
{shouldShowSecurityPage ? (

We only have organization.self_serve_sso_enabled for now to determine this, but once we have per org settings such as MFA, etc, we can move this condition to within the page content

<Route path={isSelfServeSsoPageRoot ? undefined : 'organization-self-serve-sso'}>
<Route path={isSecurityPageRoot ? undefined : 'organization-security'}>
<Switch>
<Route index>
<Suspense fallback={''}>
<OrganizationSelfServeSSOPage contentRef={contentRef} />
<OrganizationSecurityPage contentRef={contentRef} />
</Suspense>
</Route>
</Switch>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,11 +2,11 @@ import { useOrganization } from '@clerk/shared/react';

import { ConfigureSSOContent } from '../ConfigureSSO/ConfigureSSO';

type OrganizationSelfServeSSOPageProps = {
type OrganizationSecurityPageProps = {
contentRef: React.RefObject<HTMLDivElement>;
};

export const OrganizationSelfServeSSOPage = ({ contentRef }: OrganizationSelfServeSSOPageProps) => {
export const OrganizationSecurityPage = ({ contentRef }: OrganizationSecurityPageProps) => {
const { organization } = useOrganization();

if (!organization) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { bindCreateFixtures } from '@/test/create-fixtures';
import { cleanup, render, screen, waitFor } from '@/test/utils';

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

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

Expand DownExpand Up@@ -495,7 +495,7 @@ describe('OrganizationProfile', () => {
});

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();
});

it('does not include SSO when disabled at the instance level', async () => {
Expand All@@ -515,7 +515,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
await waitFor(() => expect(queryByText('Security')).toBeNull());
});

it('does not include SSO when the org has not opted in, even if the instance has it enabled', async () => {
Expand All@@ -535,7 +535,7 @@ describe('OrganizationProfile', () => {
});

const { queryByText } = render(<OrganizationProfile />, { wrapper });
await waitFor(() => expect(queryByText('Single Sign-On (SSO)')).toBeNull());
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 () => {
Expand All@@ -557,10 +557,10 @@ describe('OrganizationProfile', () => {
fixtures.clerk.user?.getEnterpriseConnections.mockResolvedValue([]);

render(<OrganizationProfile />, { wrapper });
expect(await screen.findByText('Single Sign-On (SSO)')).toBeDefined();
expect(await screen.findByText('Security')).toBeDefined();

cleanup();
render(<OrganizationSelfServeSSOPage />, { wrapper });
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),
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ export const ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID = {
MEMBERS: 'members',
BILLING: 'billing',
API_KEYS: 'apiKeys',
SELF_SERVE_SSO: 'selfServeSSO',
SECURITY: 'security',
};

export const USER_BUTTON_ITEM_ID = {
Expand Down
6 changes: 3 additions & 3 deletions packages/ui/src/contexts/components/OrganizationProfile.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ export type OrganizationProfileContextType = OrganizationProfileCtx & {
isGeneralPageRoot: boolean;
isBillingPageRoot: boolean;
isAPIKeysPageRoot: boolean;
isSelfServeSsoPageRoot: boolean;
isSecurityPageRoot: boolean;
shouldShowBilling: boolean;
shouldShowSelfServeSSO: boolean;
};
Expand DownExpand Up@@ -81,7 +81,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
const isGeneralPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.GENERAL;
const isBillingPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.BILLING;
const isAPIKeysPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.API_KEYS;
const isSelfServeSsoPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO;
const isSecurityPageRoot = pages.routes[0].id === ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY;
const navigateToGeneralPageRoot = () =>
navigate(isGeneralPageRoot ? '../' : isMembersPageRoot ? './organization-general' : '../organization-general');

Expand All@@ -95,7 +95,7 @@ export const useOrganizationProfileContext = (): OrganizationProfileContextType
isGeneralPageRoot,
isBillingPageRoot,
isAPIKeysPageRoot,
isSelfServeSsoPageRoot,
isSecurityPageRoot,
shouldShowBilling,
shouldShowSelfServeSSO,
};
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/src/utils/createCustomPages.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { CustomPage, EnvironmentResource, LoadedClerk } from '@clerk/shared

import { ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID, USER_PROFILE_NAVBAR_ROUTE_ID } from '../constants';
import type { NavbarRoute } from '../elements/Navbar';
import { Building, Code, Connections, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { Building, Code, CreditCard, ShieldCheck, UserCircle, Users } from '../icons';
import { localizationKeys } from '../localization';
import { ExternalElementMounter } from './ExternalElementMounter';
import { isDevelopmentSDK } from './runtimeEnvironment';
Expand DownExpand Up@@ -52,11 +52,11 @@ type CreateCustomPagesParams = {
getDefaultRoutes: ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}) => GetDefaultRoutesReturnType;
setFirstPathToRoot: (routes: NavbarRoute[]) => NavbarRoute[];
excludedPathsFromDuplicateWarning: string[];
Expand DownExpand Up@@ -118,7 +118,7 @@ const createCustomPages = (
apiKeys: organization
? !disabledOrganizationAPIKeysFeature(clerk, environment)
: !disabledUserAPIKeysFeature(clerk, environment),
selfServeSSO: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
security: organization ? shouldShowSelfServeSSO && !disabledSelfServeSSOFeature(clerk, environment) : false,
});

if (isDevelopmentSDK(clerk)) {
Expand DownExpand Up@@ -328,11 +328,11 @@ const getUserProfileDefaultRoutes = ({
const getOrganizationProfileDefaultRoutes = ({
commerce,
apiKeys,
selfServeSSO,
security,
}: {
commerce: boolean;
apiKeys: boolean;
selfServeSSO: boolean;
security: boolean;
}): GetDefaultRoutesReturnType => {
const INITIAL_ROUTES: NavbarRoute[] = [
{
Expand DownExpand Up@@ -364,12 +364,12 @@ const getOrganizationProfileDefaultRoutes = ({
path: 'organization-api-keys',
});
}
if (selfServeSSO) {
if (security) {
INITIAL_ROUTES.push({
name: localizationKeys('organizationProfile.navbar.selfServeSSO'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SELF_SERVE_SSO,
icon: Connections,
path: 'organization-self-serve-sso',
name: localizationKeys('organizationProfile.navbar.security'),
id: ORGANIZATION_PROFILE_NAVBAR_ROUTE_ID.SECURITY,
icon: ShieldCheck,
path: 'organization-security',
});
}

Expand Down
Loading