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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
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
13 changes: 13 additions & 0 deletions packages/ui/src/composed/UserProfile/APIKeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { APIKeysSection } from '../APIKeysSection';

const APIKeysPage = lazy(() =>
import('../../components/UserProfile/APIKeysPage').then(m => ({
default: m.APIKeysPage,
})),
);

export const UserProfileAPIKeysPanel = (): ReactNode => <APIKeysSection page={APIKeysPage} />;
40 changes: 40 additions & 0 deletions packages/ui/src/composed/UserProfile/Account.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function AccountComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='account'
titleKey={localizationKeys('userProfile.start.headerTitle__account')}
alertContent={card.error}
outerSx={t => ({ gap: t.space.$8, color: t.colors.$colorForeground, isolation: 'isolate' })}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileAccountPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <AccountPage />;
}

return (
<PageContext.Provider value='account'>
<CardStateProvider>
<AccountComposed>{children}</AccountComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountConnectedAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileConnectedAccountsSection = createSection('UserProfileConnectedAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountEmails.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEmails as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEmailSection = createSection('UserProfileEmailSection', Section);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountEnterpriseAccounts as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileEnterpriseAccountsSection = createSection('UserProfileEnterpriseAccountsSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountPhone.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountPhone as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfilePhoneSection = createSection('UserProfilePhoneSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountProfile.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { UserProfileSection } from '../../components/UserProfile/UserProfileSection';
import { createSection } from '../createSection';

export const UserProfileProfileSection = createSection('UserProfileProfileSection', UserProfileSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountUsername.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountUsername as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileUsernameSection = createSection('UserProfileUsernameSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/AccountWeb3.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { AccountWeb3 as Section } from '../../components/UserProfile/AccountSections';
import { createSection } from '../createSection';

export const UserProfileWeb3Section = createSection('UserProfileWeb3Section', Section);
38 changes: 38 additions & 0 deletions packages/ui/src/composed/UserProfile/Billing.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
'use client';

import { lazy, type ReactNode } from 'react';

import { BillingSection } from '../BillingSection';

const BillingPage = lazy(() =>
import('../../components/UserProfile/BillingPage').then(m => ({
default: m.BillingPage,
})),
);

const PlansPage = lazy(() =>
import('../../components/UserProfile/PlansPage').then(m => ({
default: m.PlansPage,
})),
);

const StatementPage = lazy(() =>
import('../../components/Statements').then(m => ({
default: m.StatementPage,
})),
);

const PaymentAttemptPage = lazy(() =>
import('../../components/PaymentAttempts').then(m => ({
default: m.PaymentAttemptPage,
})),
);

export const UserProfileBillingPanel = (): ReactNode => (
<BillingSection
billing={BillingPage}
plans={PlansPage}
statement={StatementPage}
paymentAttempt={PaymentAttemptPage}
/>
);
39 changes: 39 additions & 0 deletions packages/ui/src/composed/UserProfile/Security.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
'use client';

import type { PropsWithChildren, ReactNode } from 'react';

import { CardStateProvider, useCardState } from '@/ui/elements/contexts';
import { ProfileCard } from '@/ui/elements/ProfileCard';

import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { localizationKeys } from '../../customizables';
import { PageContext } from '../PageContext';

function SecurityComposed({ children }: PropsWithChildren): ReactNode {
const card = useCardState();
return (
<ProfileCard.Page>
<ProfileCard.PagePanel
pageId='security'
titleKey={localizationKeys('userProfile.start.headerTitle__security')}
alertContent={card.error}
>
{children}
</ProfileCard.PagePanel>
</ProfileCard.Page>
);
}

export function UserProfileSecurityPanel({ children }: PropsWithChildren): ReactNode {
if (!children) {
return <SecurityPage />;
}

return (
<PageContext.Provider value='security'>
<CardStateProvider>
<SecurityComposed>{children}</SecurityComposed>
</CardStateProvider>
</PageContext.Provider>
);
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { ActiveDevicesSection } from '../../components/UserProfile/ActiveDevicesSection';
import { createSection } from '../createSection';

export const UserProfileActiveDevicesSection = createSection('UserProfileActiveDevicesSection', ActiveDevicesSection);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityDelete.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityDelete as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileDeleteSection = createSection('UserProfileDeleteSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityMfa.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityMfa as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfileMfaSection = createSection('UserProfileMfaSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPasskeys.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPasskeys as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasskeysSection = createSection('UserProfilePasskeysSection', Section);
6 changes: 6 additions & 0 deletions packages/ui/src/composed/UserProfile/SecurityPassword.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
'use client';

import { SecurityPassword as Section } from '../../components/UserProfile/SecuritySections';
import { createSection } from '../createSection';

export const UserProfilePasswordSection = createSection('UserProfilePasswordSection', Section);
52 changes: 52 additions & 0 deletions packages/ui/src/composed/UserProfile/UserProfileProvider.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
'use client';

import { useClerk, useUser } from '@clerk/shared/react';
import type { OAuthProvider, OAuthScope, UserProfileProps } from '@clerk/shared/types';
import type { PropsWithChildren, ReactNode } from 'react';

import type { Appearance } from '@/ui/internal/appearance';

import { UserProfileContext } from '../../contexts/components/UserProfile';
import { ProfileProviderShell, resolveComposedClerkRuntime } from '../ProfileProviderShell';

type UserProfileProviderProps = PropsWithChildren<{
appearance?: Appearance;
additionalOAuthScopes?: Partial<Record<OAuthProvider, OAuthScope[]>>;
apiKeysProps?: UserProfileProps['apiKeysProps'];
}>;

export const UserProfileProvider = (props: UserProfileProviderProps): ReactNode => {
const { children, appearance, additionalOAuthScopes, apiKeysProps } = props;
const clerk = useClerk();
const { isLoaded, user } = useUser();

const { environment, moduleManager } = resolveComposedClerkRuntime(clerk, isLoaded);

if (!isLoaded || !user || !environment) {
return null;
}

const userProfileCtxValue = {
componentName: 'UserProfile' as const,
mode: 'mounted' as const,
routing: 'hash' as const,
path: undefined,
additionalOAuthScopes,
apiKeysProps,
customPages: [],
};

return (
<ProfileProviderShell
clerk={clerk}
environment={environment}
moduleManager={moduleManager}
appearanceKey='userProfile'
flow='userProfile'
globalAppearance={clerk.__internal_getOption('appearance')}
appearance={appearance}
>
<UserProfileContext.Provider value={userProfileCtxValue}>{children}</UserProfileContext.Provider>
</ProfileProviderShell>
);
};
17 changes: 17 additions & 0 deletions packages/ui/src/composed/UserProfile/index.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
export { UserProfileProvider } from './UserProfileProvider';
export { UserProfileAccountPanel } from './Account';
export { UserProfileSecurityPanel } from './Security';
export { UserProfileBillingPanel } from './Billing';
export { UserProfileAPIKeysPanel } from './APIKeys';
export { UserProfileProfileSection } from './AccountProfile';
export { UserProfileUsernameSection } from './AccountUsername';
export { UserProfileEmailSection } from './AccountEmails';
export { UserProfilePhoneSection } from './AccountPhone';
export { UserProfileConnectedAccountsSection } from './AccountConnectedAccounts';
export { UserProfileEnterpriseAccountsSection } from './AccountEnterpriseAccounts';
export { UserProfileWeb3Section } from './AccountWeb3';
export { UserProfilePasswordSection } from './SecurityPassword';
export { UserProfilePasskeysSection } from './SecurityPasskeys';
export { UserProfileMfaSection } from './SecurityMfa';
export { UserProfileActiveDevicesSection } from './SecurityActiveDevices';
export { UserProfileDeleteSection } from './SecurityDelete';
56 changes: 56 additions & 0 deletions packages/ui/src/composed/__tests__/UserProfile.test.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
import { beforeEach, describe, expect, it } from 'vitest';

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

import { AccountPage } from '../../components/UserProfile/AccountPage';
import { SecurityPage } from '../../components/UserProfile/SecurityPage';
import { clearFetchCache } from '../../hooks';

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

describe('Experimental UserProfile', () => {
beforeEach(() => {
clearFetchCache();
});

// The page components (AccountPage/SecurityPage) are thin wrappers that render
// the composed panels. The section-visibility matrix is asserted once at the
// component level in AccountSections/SecuritySections; here we only cover what
// the page level adds — the enterprise-SSO additional-identification guard —
// plus a single mount smoke per page.
describe('Account page', () => {
it('hides add buttons when enterprise SSO disables additional identifications', async () => {
const { wrapper } = await createFixtures(f => {
f.withEmailAddress();
f.withUser({
email_addresses: ['test@clerk.com'],
enterprise_accounts: [
{
active: true,
enterprise_connection: {
disable_additional_identifications: true,
},
} as any,
],
});
f.withEnterpriseSso();
});

const { queryByRole } = render(<AccountPage />, { wrapper });
expect(queryByRole('button', { name: /add email address/i })).not.toBeInTheDocument();
});
});

describe('Security page', () => {
it('renders active devices section', 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(() => screen.getByText(/active devices/i));
});
});
});
Loading
Loading