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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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/rotten-baths-wish.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch

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.

💡 Verification agent

🧩 Analysis chain

Double-check release type (patch vs. minor/major) given public surface changes.

If this PR only gates visibility and doesn’t change public types/APIs, “patch” is fine. If UserProfileContextType gained a new exported field or public Passkey types changed (e.g., credential_id removal), consider “minor” or “major” depending on breakage. Please verify.

Run this script to spot potential public-facing changes and usages that might warrant a higher bump:


🏁 Script executed:

#!/bin/bashset -euo pipefail
echo"Searching for new context field 'shouldAllowIdentificationCreation' exports and usages:"
rg -nP -C2 '\bshouldAllowIdentificationCreation\b'echoecho"Checking for usage of 'credential_id' that might indicate a breaking type change:"
rg -nP -C2 '\bcredential_id\b' --type=ts --type=tsx ||trueechoecho"List all changesets for @clerk/clerk-js to ensure consistency:"
rg -nP -C1 "^'@clerk/clerk-js':\s*(major|minor|patch)\b" .changeset
echoecho"Confirm package name exists:"
fd package.json | xargs -I{} jq -r '.name + " :: " + input_filename' {} | rg -n '@clerk/clerk-js'

Length of output: 5925


Bump @clerk/clerk-js to minor
The new shouldAllowIdentificationCreation field was added to the exported UserProfileContextType, which expands the public API in a backwards-compatible way. This requires a minor version bump, not a patch.

• File: .changeset/rotten-baths-wish.md
– Change line 2 from
'@clerk/clerk-js': patch
to
'@clerk/clerk-js': minor

🤖 Prompt for AI Agents
In .changeset/rotten-baths-wish.md around line 2, the release type for
'@clerk/clerk-js' is set to "patch" but should be "minor"; open that file and
change the second line from `'@clerk/clerk-js': patch` to `'@clerk/clerk-js':
minor`, save, and commit the updated changeset.

---

Hide passkeys section when user has an enterprise account with the disable additional identifiers setting enabled
4 changes: 2 additions & 2 deletions packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
{
"files": [
{ "path": "./dist/clerk.js", "maxSize": "626.1KB" },
{ "path": "./dist/clerk.js", "maxSize": "629KB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "78KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "119KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "61KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "114.1KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "117.1KB" },
{ "path": "./dist/ui-common*.legacy.*.js", "maxSize": "118KB" },
{ "path": "./dist/vendors*.js", "maxSize": "41KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
Expand Down
10 changes: 2 additions & 8 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ConnectedAccountsSection } from './ConnectedAccountsSection';
import { EmailsSection } from './EmailsSection';
Expand All@@ -18,6 +18,7 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, social, enterpriseSSO } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();

const showUsername = attributes.username?.enabled;
const showEmail = attributes.email_address?.enabled;
Expand All@@ -26,13 +27,6 @@ export const AccountPage = withCardStateProvider(() => {
const showEnterpriseAccounts = user && enterpriseSSO.enabled;
const showWeb3 = attributes.web3_wallet?.enabled;

const shouldAllowIdentificationCreation =
!showEnterpriseAccounts ||
!user.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import { Card } from '@/ui/elements/Card';
import { useCardState, withCardStateProvider } from '@/ui/elements/contexts';
import { Header } from '@/ui/elements/Header';

import { useEnvironment } from '../../contexts';
import { useEnvironment, useUserProfileContext } from '../../contexts';
import { Col, descriptors, localizationKeys } from '../../customizables';
import { ActiveDevicesSection } from './ActiveDevicesSection';
import { DeleteSection } from './DeleteSection';
Expand All@@ -17,8 +17,9 @@ export const SecurityPage = withCardStateProvider(() => {
const { attributes, instanceIsPasswordBased } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();
const { shouldAllowIdentificationCreation } = useUserProfileContext();
const showPassword = instanceIsPasswordBased;
const showPasskey = attributes.passkey?.enabled;
const showPasskey = attributes.passkey?.enabled && shouldAllowIdentificationCreation;
const showMfa = getSecondFactors(attributes).length > 0;
const showDelete = user?.deleteSelfEnabled;

Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,7 +70,6 @@ describe('SecurityPage', () => {
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
credential_id: 'some_id',
},
],
});
Expand All@@ -85,6 +84,195 @@ describe('SecurityPage', () => {
getByText(/^Last used:/);
});

describe('Passkeys section visibility', () => {
describe('with active enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: false,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when disable_additional_identifications is true', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withEmailAddress();
f.withEnterpriseSso();
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
enterprise_accounts: [
{
object: 'enterprise_account',
active: true,
first_name: 'Laura',
last_name: 'Serafim',
protocol: 'saml',
provider_user_id: null,
public_metadata: {},
email_address: 'test@clerk.com',
provider: 'saml_okta',
enterprise_connection: {
object: 'enterprise_connection',
provider: 'saml_okta',
name: 'Okta Workforce',
id: 'ent_123',
active: true,
allow_idp_initiated: false,
allow_subdomains: false,
disable_additional_identifications: true,
sync_user_attributes: false,
domain: 'foocorp.com',
created_at: 123,
updated_at: 123,
logo_public_url: null,
protocol: 'saml',
},
verification: {
status: 'verified',
strategy: 'saml',
verified_at_client: 'foo',
attempts: 0,
error: {
code: 'identifier_already_signed_in',
long_message: "You're already signed in",
message: "You're already signed in",
},
expire_at: 123,
id: 'ver_123',
object: 'verification',
},
id: 'eac_123',
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
expect(screen.queryByText('Chrome on Mac')).not.toBeInTheDocument();
});
});

describe('without enterprise connection', () => {
it('shows the passkeys section when passkeys are enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withPasskey();
f.withUser({
email_addresses: ['test@clerk.com'],
passkeys: [
{
object: 'passkey',
id: '1234',
name: 'Chrome on Mac',
created_at: Date.now(),
last_used_at: Date.now(),
verification: null,
updated_at: Date.now(),
},
],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
screen.getByText('Passkeys');
screen.getByText('Chrome on Mac');
});

it('hides the passkeys section when passkeys are not enabled', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withUser({
email_addresses: ['test@clerk.com'],
});
});
fixtures.clerk.user?.getSessions.mockReturnValue(Promise.resolve([]));

render(<SecurityPage />, { wrapper });
await waitFor(() => expect(fixtures.clerk.user?.getSessions).toHaveBeenCalled());
expect(screen.queryByText('Passkeys')).not.toBeInTheDocument();
});
});
});

it('shows the active devices of the user and has appropriate buttons', async () => {
const { wrapper, fixtures } = await createFixtures(f => {
f.withSocialProvider({ provider: 'google' });
Expand Down
18 changes: 17 additions & 1 deletion packages/clerk-js/src/ui/contexts/components/UserProfile.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { useClerk } from '@clerk/shared/react';
import { useClerk, useUser } from '@clerk/shared/react';
import { createContext, useContext, useMemo } from 'react';

import type { NavbarRoute } from '@/ui/elements/Navbar';
Expand All@@ -20,6 +20,7 @@ export type UserProfileContextType = UserProfileCtx & {
queryParams: ParsedQueryString;
authQueryString: string | null;
pages: PagesType;
shouldAllowIdentificationCreation: boolean;
};

export const UserProfileContext = createContext<UserProfileCtx | null>(null);
Expand All@@ -29,6 +30,7 @@ export const useUserProfileContext = (): UserProfileContextType => {
const { queryParams } = useRouter();
const clerk = useClerk();
const environment = useEnvironment();
const { user } = useUser();

if (!context || context.componentName !== 'UserProfile') {
throw new Error('Clerk: useUserProfileContext called outside of the mounted UserProfile component.');
Expand All@@ -40,11 +42,25 @@ export const useUserProfileContext = (): UserProfileContextType => {
return createUserProfileCustomPages(customPages || [], clerk, environment);
}, [customPages]);

const shouldAllowIdentificationCreation = useMemo(() => {
const { enterpriseSSO } = environment.userSettings;
const showEnterpriseAccounts = user && enterpriseSSO.enabled;

return (
!showEnterpriseAccounts ||
!user?.enterpriseAccounts.some(
enterpriseAccount =>
enterpriseAccount.active && enterpriseAccount.enterpriseConnection?.disableAdditionalIdentifications,
)
);
}, [user, environment.userSettings.enterpriseSSO]);

return {
...ctx,
pages,
componentName,
queryParams,
authQueryString: '',
shouldAllowIdentificationCreation,
};
};
Loading