feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wobsoriano merged 10 commits into from
May 1, 2026
Merged

feat(ui): Show OAuthConsent org selector from user:org:read scope #8415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
84741f7
docs: add accounts portal OAuth consent refactor spec
wobsoriano Apr 15, 2026
80f531b
feat(ui): Show OAuthConsent org selector from user:org:read scope
wobsoriano Apr 28, 2026
94d1cde
chore: add changeset
wobsoriano Apr 28, 2026
b92f37b
chore: update changeset
wobsoriano Apr 28, 2026
1315d8b
chore: put back old prop
wobsoriano Apr 29, 2026
3f8ffd2
Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…
wobsoriano Apr 29, 2026
ff941e1
Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…
wobsoriano Apr 29, 2026
53f4b54
Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…
wobsoriano Apr 29, 2026
35ae81c
Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…
wobsoriano Apr 30, 2026
c11d614
Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…
wobsoriano May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fluffy-readers-strive.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.
29 changes: 15 additions & 14 deletions packages/ui/src/components/OAuthConsent/OAuthConsent.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
} = useEnvironment();
const [isUriModalOpen, setIsUriModalOpen] = useState(false);

const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
const orgOptions = orgSelectionEnabled
? (user?.organizationMemberships ?? []).map(m => ({
value: m.organization.id,
label: m.organization.name,
logoUrl: m.organization.imageUrl,
}))
: [];

const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
const effectiveOrg = selectedOrg ?? defaultOrg;

// onAllow and onDeny are always provided as a pair by the accounts portal.
const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);

@wobsorianowobsorianoApr 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.

const orgOptions = orgSelectionEnabled
? (user?.organizationMemberships ?? []).map(m => ({
value: m.organization.id,
label: m.organization.name,
logoUrl: m.organization.imageUrl,
}))
: [];
const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
const effectiveOrg = selectedOrg ?? defaultOrg;

const { t } = useLocalizations();
const domainAction = getRedirectDisplay(redirectUrl);
const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

return (
Expand Down
90 changes: 75 additions & 15 deletions packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
],
};

const fakeConsentInfoWithOrgScope = {
...fakeConsentInfo,
scopes: [
...fakeConsentInfo.scopes,
{ scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
],
};

/**
* `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
* directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
});

describe('org selection', () => {
it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
it('does not render the org selector when user:org:read scope is absent', async () => {
const { wrapper, fixtures, props } = await createFixtures(f => {
f.withUser({
email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
});

it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
// SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
// SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
// so no org select and no useOrganizationList call.
const { wrapper, fixtures, props } = await createFixtures(f => {
f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
// intentionally NOT calling f.withOrganizations()
});

props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
props.setProps({ componentName: 'OAuthConsent' } as any);
mockOAuthApplication(fixtures.clerk, {
getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
});

const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
});
});

it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
const { wrapper, fixtures, props } = await createFixtures(f => {
f.withUser({
email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
f.withOrganizations();
});

props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
props.setProps({ componentName: 'OAuthConsent' } as any);
mockOAuthApplication(fixtures.clerk, {
getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
});

const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
});
});

it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
const { wrapper, fixtures, props } = await createFixtures(f => {
f.withUser({
email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

const { getByText } = render(<OAuthConsent />, { wrapper });

await waitFor(() => {
expect(getByText('Acme Corp')).toBeVisible();
});
});

it('does not display user:org:read in the scopes list', async () => {
const { wrapper, fixtures, props } = await createFixtures(f => {
f.withUser({
email_addresses: ['jane@example.com'],
organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
});
f.withOrganizations();
});

props.setProps({ componentName: 'OAuthConsent' } as any);
mockOAuthApplication(fixtures.clerk, {
getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
});

const { queryByText } = render(<OAuthConsent />, { wrapper });

await waitFor(() => {
expect(queryByText('Access your organizations')).toBeNull();
});
});

it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
const { wrapper, fixtures, props } = await createFixtures(f => {
f.withUser({
email_addresses: ['jane@example.com'],
organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
});
f.withOrganizations();
});

props.setProps({ componentName: 'OAuthConsent' } as any);
mockOAuthApplication(fixtures.clerk, {
getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
});

const { baseElement } = render(<OAuthConsent />, { wrapper });

await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
});
});

it('does not include organization_id in the form when org selection is disabled', async () => {
it('does not include organization_id in the form when user:org:read scope is absent', async () => {
const { wrapper, fixtures, props } = await createFixtures(f => {
f.withUser({ email_addresses: ['jane@example.com'] });
});
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
props.setProps({ componentName: 'OAuthConsent' } as any);
mockOAuthApplication(fixtures.clerk, {
getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
});

const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
props.setProps({ componentName: 'OAuthConsent' } as any);
mockOAuthApplication(fixtures.clerk, {
getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
});

const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

fixtures.clerk.session.lastActiveOrganizationId = null;

props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
props.setProps({ componentName: 'OAuthConsent' } as any);
mockOAuthApplication(fixtures.clerk, {
getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
});

const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
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
feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 10 commits into

from

May 1, 2026
 Merged


feat(ui): Show OAuthConsent org selector from user:org:read scope
#8415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
84741f7

docs: add accounts portal OAuth consent refactor spec


wobsoriano Apr 15, 2026
80f531b

feat(ui): Show OAuthConsent org selector from user:org:read scope


wobsoriano Apr 28, 2026
94d1cde

chore: add changeset


wobsoriano Apr 28, 2026
b92f37b

chore: update changeset


wobsoriano Apr 28, 2026
1315d8b

chore: put back old prop


wobsoriano Apr 29, 2026
3f8ffd2

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
ff941e1

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
53f4b54

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
35ae81c

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 30, 2026
c11d614

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano May 1, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/fluffy-readers-strive.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.

29 changes: 15 additions & 14 deletions
packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
 const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
 } = useEnvironment();
 const [isUriModalOpen, setIsUriModalOpen] = useState(false);

 const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];

 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

 const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
 const effectiveOrg = selectedOrg ?? defaultOrg;

 // onAllow and onDeny are always provided as a pair by the accounts portal.
 const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
 const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
 const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

 const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
 const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);
@wobsorianowobsorianoApr 29, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];
 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
 const effectiveOrg = selectedOrg ?? defaultOrg;

 const { t } = useLocalizations();
 const domainAction = getRedirectDisplay(redirectUrl);
 const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

 const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

 const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
 const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
 const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

 return (
Expand Down

90 changes: 75 additions & 15 deletions
packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
 ],
};

const fakeConsentInfoWithOrgScope = {
 ...fakeConsentInfo,
 scopes: [
 ...fakeConsentInfo.scopes,
 { scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
 ],
};

/**
 * `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
 * directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
 });

 describe('org selection', () => {
 it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
 it('does not render the org selector when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
 });

 it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
 // SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
 // SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
 // so no org select and no useOrganizationList call.
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
 // intentionally NOT calling f.withOrganizations()
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
 it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
 it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

 const { getByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(getByText('Acme Corp')).toBeVisible();
 });
 });

 it('does not display user:org:read in the scopes list', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(queryByText('Access your organizations')).toBeNull();
 });
 });

 it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('does not include organization_id in the form when org selection is disabled', async () => {
 it('does not include organization_id in the form when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({ email_addresses: ['jane@example.com'] });
 });
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = null;

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
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
feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 10 commits into

from

May 1, 2026
 Merged


feat(ui): Show OAuthConsent org selector from user:org:read scope
#8415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
84741f7

docs: add accounts portal OAuth consent refactor spec


wobsoriano Apr 15, 2026
80f531b

feat(ui): Show OAuthConsent org selector from user:org:read scope


wobsoriano Apr 28, 2026
94d1cde

chore: add changeset


wobsoriano Apr 28, 2026
b92f37b

chore: update changeset


wobsoriano Apr 28, 2026
1315d8b

chore: put back old prop


wobsoriano Apr 29, 2026
3f8ffd2

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
ff941e1

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
53f4b54

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
35ae81c

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 30, 2026
c11d614

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano May 1, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/fluffy-readers-strive.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.

29 changes: 15 additions & 14 deletions
packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
 const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
 } = useEnvironment();
 const [isUriModalOpen, setIsUriModalOpen] = useState(false);

 const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];

 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

 const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
 const effectiveOrg = selectedOrg ?? defaultOrg;

 // onAllow and onDeny are always provided as a pair by the accounts portal.
 const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
 const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
 const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

 const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
 const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);
@wobsorianowobsorianoApr 29, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];
 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
 const effectiveOrg = selectedOrg ?? defaultOrg;

 const { t } = useLocalizations();
 const domainAction = getRedirectDisplay(redirectUrl);
 const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

 const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

 const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
 const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
 const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

 return (
Expand Down

90 changes: 75 additions & 15 deletions
packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
 ],
};

const fakeConsentInfoWithOrgScope = {
 ...fakeConsentInfo,
 scopes: [
 ...fakeConsentInfo.scopes,
 { scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
 ],
};

/**
 * `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
 * directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
 });

 describe('org selection', () => {
 it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
 it('does not render the org selector when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
 });

 it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
 // SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
 // SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
 // so no org select and no useOrganizationList call.
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
 // intentionally NOT calling f.withOrganizations()
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
 it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
 it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

 const { getByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(getByText('Acme Corp')).toBeVisible();
 });
 });

 it('does not display user:org:read in the scopes list', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(queryByText('Access your organizations')).toBeNull();
 });
 });

 it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('does not include organization_id in the form when org selection is disabled', async () => {
 it('does not include organization_id in the form when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({ email_addresses: ['jane@example.com'] });
 });
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = null;

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
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
feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 10 commits into

from

May 1, 2026
 Merged


feat(ui): Show OAuthConsent org selector from user:org:read scope
#8415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
84741f7

docs: add accounts portal OAuth consent refactor spec


wobsoriano Apr 15, 2026
80f531b

feat(ui): Show OAuthConsent org selector from user:org:read scope


wobsoriano Apr 28, 2026
94d1cde

chore: add changeset


wobsoriano Apr 28, 2026
b92f37b

chore: update changeset


wobsoriano Apr 28, 2026
1315d8b

chore: put back old prop


wobsoriano Apr 29, 2026
3f8ffd2

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
ff941e1

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
53f4b54

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
35ae81c

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 30, 2026
c11d614

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano May 1, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/fluffy-readers-strive.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.

29 changes: 15 additions & 14 deletions
packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
 const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
 } = useEnvironment();
 const [isUriModalOpen, setIsUriModalOpen] = useState(false);

 const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];

 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

 const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
 const effectiveOrg = selectedOrg ?? defaultOrg;

 // onAllow and onDeny are always provided as a pair by the accounts portal.
 const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
 const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
 const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

 const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
 const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);
@wobsorianowobsorianoApr 29, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];
 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
 const effectiveOrg = selectedOrg ?? defaultOrg;

 const { t } = useLocalizations();
 const domainAction = getRedirectDisplay(redirectUrl);
 const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

 const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

 const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
 const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
 const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

 return (
Expand Down

90 changes: 75 additions & 15 deletions
packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
 ],
};

const fakeConsentInfoWithOrgScope = {
 ...fakeConsentInfo,
 scopes: [
 ...fakeConsentInfo.scopes,
 { scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
 ],
};

/**
 * `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
 * directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
 });

 describe('org selection', () => {
 it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
 it('does not render the org selector when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
 });

 it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
 // SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
 // SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
 // so no org select and no useOrganizationList call.
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
 // intentionally NOT calling f.withOrganizations()
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
 it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
 it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

 const { getByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(getByText('Acme Corp')).toBeVisible();
 });
 });

 it('does not display user:org:read in the scopes list', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(queryByText('Access your organizations')).toBeNull();
 });
 });

 it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('does not include organization_id in the form when org selection is disabled', async () => {
 it('does not include organization_id in the form when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({ email_addresses: ['jane@example.com'] });
 });
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = null;

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
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
feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 10 commits into

from

May 1, 2026
 Merged


feat(ui): Show OAuthConsent org selector from user:org:read scope
#8415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
84741f7

docs: add accounts portal OAuth consent refactor spec


wobsoriano Apr 15, 2026
80f531b

feat(ui): Show OAuthConsent org selector from user:org:read scope


wobsoriano Apr 28, 2026
94d1cde

chore: add changeset


wobsoriano Apr 28, 2026
b92f37b

chore: update changeset


wobsoriano Apr 28, 2026
1315d8b

chore: put back old prop


wobsoriano Apr 29, 2026
3f8ffd2

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
ff941e1

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
53f4b54

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
35ae81c

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 30, 2026
c11d614

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano May 1, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/fluffy-readers-strive.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.

29 changes: 15 additions & 14 deletions
packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
 const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
 } = useEnvironment();
 const [isUriModalOpen, setIsUriModalOpen] = useState(false);

 const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];

 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

 const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
 const effectiveOrg = selectedOrg ?? defaultOrg;

 // onAllow and onDeny are always provided as a pair by the accounts portal.
 const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
 const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
 const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

 const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
 const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);
@wobsorianowobsorianoApr 29, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];
 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
 const effectiveOrg = selectedOrg ?? defaultOrg;

 const { t } = useLocalizations();
 const domainAction = getRedirectDisplay(redirectUrl);
 const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

 const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

 const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
 const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
 const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

 return (
Expand Down

90 changes: 75 additions & 15 deletions
packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
 ],
};

const fakeConsentInfoWithOrgScope = {
 ...fakeConsentInfo,
 scopes: [
 ...fakeConsentInfo.scopes,
 { scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
 ],
};

/**
 * `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
 * directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
 });

 describe('org selection', () => {
 it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
 it('does not render the org selector when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
 });

 it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
 // SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
 // SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
 // so no org select and no useOrganizationList call.
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
 // intentionally NOT calling f.withOrganizations()
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
 it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
 it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

 const { getByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(getByText('Acme Corp')).toBeVisible();
 });
 });

 it('does not display user:org:read in the scopes list', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(queryByText('Access your organizations')).toBeNull();
 });
 });

 it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('does not include organization_id in the form when org selection is disabled', async () => {
 it('does not include organization_id in the form when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({ email_addresses: ['jane@example.com'] });
 });
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = null;

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
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
feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 10 commits into

from

May 1, 2026
 Merged


feat(ui): Show OAuthConsent org selector from user:org:read scope
#8415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
84741f7

docs: add accounts portal OAuth consent refactor spec


wobsoriano Apr 15, 2026
80f531b

feat(ui): Show OAuthConsent org selector from user:org:read scope


wobsoriano Apr 28, 2026
94d1cde

chore: add changeset


wobsoriano Apr 28, 2026
b92f37b

chore: update changeset


wobsoriano Apr 28, 2026
1315d8b

chore: put back old prop


wobsoriano Apr 29, 2026
3f8ffd2

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
ff941e1

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
53f4b54

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
35ae81c

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 30, 2026
c11d614

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano May 1, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/fluffy-readers-strive.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.

29 changes: 15 additions & 14 deletions
packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
 const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
 } = useEnvironment();
 const [isUriModalOpen, setIsUriModalOpen] = useState(false);

 const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];

 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

 const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
 const effectiveOrg = selectedOrg ?? defaultOrg;

 // onAllow and onDeny are always provided as a pair by the accounts portal.
 const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
 const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
 const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

 const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
 const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);
@wobsorianowobsorianoApr 29, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];
 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
 const effectiveOrg = selectedOrg ?? defaultOrg;

 const { t } = useLocalizations();
 const domainAction = getRedirectDisplay(redirectUrl);
 const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

 const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

 const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
 const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
 const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

 return (
Expand Down

90 changes: 75 additions & 15 deletions
packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
 ],
};

const fakeConsentInfoWithOrgScope = {
 ...fakeConsentInfo,
 scopes: [
 ...fakeConsentInfo.scopes,
 { scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
 ],
};

/**
 * `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
 * directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
 });

 describe('org selection', () => {
 it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
 it('does not render the org selector when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
 });

 it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
 // SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
 // SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
 // so no org select and no useOrganizationList call.
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
 // intentionally NOT calling f.withOrganizations()
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
 it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
 it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

 const { getByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(getByText('Acme Corp')).toBeVisible();
 });
 });

 it('does not display user:org:read in the scopes list', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(queryByText('Access your organizations')).toBeNull();
 });
 });

 it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('does not include organization_id in the form when org selection is disabled', async () => {
 it('does not include organization_id in the form when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({ email_addresses: ['jane@example.com'] });
 });
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = null;

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
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
feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 10 commits into

from

May 1, 2026
 Merged


feat(ui): Show OAuthConsent org selector from user:org:read scope
#8415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
84741f7

docs: add accounts portal OAuth consent refactor spec


wobsoriano Apr 15, 2026
80f531b

feat(ui): Show OAuthConsent org selector from user:org:read scope


wobsoriano Apr 28, 2026
94d1cde

chore: add changeset


wobsoriano Apr 28, 2026
b92f37b

chore: update changeset


wobsoriano Apr 28, 2026
1315d8b

chore: put back old prop


wobsoriano Apr 29, 2026
3f8ffd2

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
ff941e1

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
53f4b54

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
35ae81c

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 30, 2026
c11d614

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano May 1, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/fluffy-readers-strive.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.

29 changes: 15 additions & 14 deletions
packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
 const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
 } = useEnvironment();
 const [isUriModalOpen, setIsUriModalOpen] = useState(false);

 const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];

 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

 const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
 const effectiveOrg = selectedOrg ?? defaultOrg;

 // onAllow and onDeny are always provided as a pair by the accounts portal.
 const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
 const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
 const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

 const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
 const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);
@wobsorianowobsorianoApr 29, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];
 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
 const effectiveOrg = selectedOrg ?? defaultOrg;

 const { t } = useLocalizations();
 const domainAction = getRedirectDisplay(redirectUrl);
 const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

 const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

 const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
 const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
 const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

 return (
Expand Down

90 changes: 75 additions & 15 deletions
packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
 ],
};

const fakeConsentInfoWithOrgScope = {
 ...fakeConsentInfo,
 scopes: [
 ...fakeConsentInfo.scopes,
 { scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
 ],
};

/**
 * `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
 * directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
 });

 describe('org selection', () => {
 it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
 it('does not render the org selector when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
 });

 it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
 // SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
 // SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
 // so no org select and no useOrganizationList call.
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
 // intentionally NOT calling f.withOrganizations()
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
 it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
 it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

 const { getByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(getByText('Acme Corp')).toBeVisible();
 });
 });

 it('does not display user:org:read in the scopes list', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(queryByText('Access your organizations')).toBeNull();
 });
 });

 it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('does not include organization_id in the form when org selection is disabled', async () => {
 it('does not include organization_id in the form when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({ email_addresses: ['jane@example.com'] });
 });
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = null;

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
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
feat(ui): Show OAuthConsent org selector from user:org:read scope#8415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

wobsoriano
merged 10 commits into

from

May 1, 2026
 Merged


feat(ui): Show OAuthConsent org selector from user:org:read scope
#8415
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
84741f7

docs: add accounts portal OAuth consent refactor spec


wobsoriano Apr 15, 2026
80f531b

feat(ui): Show OAuthConsent org selector from user:org:read scope


wobsoriano Apr 28, 2026
94d1cde

chore: add changeset


wobsoriano Apr 28, 2026
b92f37b

chore: update changeset


wobsoriano Apr 28, 2026
1315d8b

chore: put back old prop


wobsoriano Apr 29, 2026
3f8ffd2

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
ff941e1

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
53f4b54

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 29, 2026
35ae81c

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano Apr 30, 2026
c11d614

Merge branch 'main' into rob/user-5239-sdk-should-use-new-scope-for-d…


wobsoriano May 1, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.changeset/fluffy-readers-strive.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': minor
---

Render OAuthConsent organization selector from `user:org:read` scope.

29 changes: 15 additions & 14 deletions
packages/ui/src/components/OAuthConsent/OAuthConsent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ import { OrgSelect } from './OrgSelect';
import { getForwardedParams, getOAuthConsentFromSearch, getRedirectDisplay, getRedirectUriFromSearch } from './utils';

const OFFLINE_ACCESS_SCOPE = 'offline_access';
const USER_ORG_READ_SCOPE = 'user:org:read';

function _OAuthConsent() {
 const ctx = useOAuthConsentContext();
Expand All@@ -37,20 +38,7 @@ function _OAuthConsent() {
 } = useEnvironment();
 const [isUriModalOpen, setIsUriModalOpen] = useState(false);

 const orgSelectionEnabled = !!(ctx.enableOrgSelection && organizationSettings.enabled);
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];

 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;

 const [selectedOrg, setSelectedOrg] = useState<string | null>(null);
 const effectiveOrg = selectedOrg ?? defaultOrg;

 // onAllow and onDeny are always provided as a pair by the accounts portal.
 const hasContextCallbacks = Boolean(ctx.onAllow || ctx.onDeny);
Expand DownExpand Up@@ -83,6 +71,19 @@ function _OAuthConsent() {
 const oauthApplicationUrl = ctx.oauthApplicationUrl ?? data?.oauthApplicationUrl;
 const redirectUrl = ctx.redirectUrl ?? getRedirectUriFromSearch();

 const hasOrgReadScope = scopes.some(s => s.scope === USER_ORG_READ_SCOPE);
 const orgSelectionEnabled = !!((hasOrgReadScope || ctx.enableOrgSelection) && organizationSettings.enabled);
@wobsorianowobsorianoApr 29, 2026

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

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

The new scope takes precedence over __internal_enableOrgSelection when present, so we can safely remove the flag in a follow-up PR once confirmed working.
 const orgOptions = orgSelectionEnabled
 ? (user?.organizationMemberships ?? []).map(m => ({
 value: m.organization.id,
 label: m.organization.name,
 logoUrl: m.organization.imageUrl,
 }))
 : [];
 const lastActiveOrgId = clerk.session?.lastActiveOrganizationId;
 const defaultOrg = orgOptions.find(o => o.value === lastActiveOrgId)?.value ?? orgOptions[0]?.value ?? null;
 const effectiveOrg = selectedOrg ?? defaultOrg;

 const { t } = useLocalizations();
 const domainAction = getRedirectDisplay(redirectUrl);
 const viewFullUrlText = t(localizationKeys('oauthConsent.viewFullUrl'));
Expand DownExpand Up@@ -139,7 +140,7 @@ function _OAuthConsent() {

 const primaryIdentifier = user?.primaryEmailAddress?.emailAddress || user?.primaryPhoneNumber?.phoneNumber;

 const displayedScopes = scopes.filter(item => item.scope !== OFFLINE_ACCESS_SCOPE);
 const displayedScopes = scopes.filter(item => ![OFFLINE_ACCESS_SCOPE, USER_ORG_READ_SCOPE].includes(item.scope));
 const hasOfflineAccess = scopes.some(item => item.scope === OFFLINE_ACCESS_SCOPE);

 return (
Expand Down

90 changes: 75 additions & 15 deletions
packages/ui/src/components/OAuthConsent/__tests__/OAuthConsent.test.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,14 @@ const fakeConsentInfo = {
 ],
};

const fakeConsentInfoWithOrgScope = {
 ...fakeConsentInfo,
 scopes: [
 ...fakeConsentInfo.scopes,
 { scope: 'user:org:read', description: 'Access your organizations', requiresConsent: true },
 ],
};

/**
 * `oauthApplication` is a getter on the Clerk prototype and cannot be assigned
 * directly. Use Object.defineProperty to replace it with a configurable mock.
Expand DownExpand Up@@ -319,7 +327,7 @@ describe('OAuthConsent', () => {
 });

 describe('org selection', () => {
 it('does not render the org selector when __internal_enableOrgSelection is not set', async () => {
 it('does not render the org selector when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -339,7 +347,7 @@ describe('OAuthConsent', () => {
 });

 it('does not render the org selector when organizations feature is disabled in the dashboard', async () => {
 // SDK-63: enableOrgSelection is set but organizationSettings.enabled is false,
 // SDK-63: user:org:read scope is present but organizationSettings.enabled is false,
 // so no org select and no useOrganizationList call.
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
Expand All@@ -349,8 +357,10 @@ describe('OAuthConsent', () => {
 // intentionally NOT calling f.withOrganizations()
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByRole } = render(<OAuthConsent />, { wrapper });

Expand All@@ -359,7 +369,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('renders the org selector when __internal_enableOrgSelection is true and user has memberships', async () => {
 it('renders the org selector when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -368,8 +378,10 @@ describe('OAuthConsent', () => {
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { getByText } = render(<OAuthConsent />, { wrapper });

Expand All@@ -378,7 +390,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('includes a hidden organization_id input when org selection is enabled and user has memberships', async () => {
 it('renders the org selector when __internal_enableOrgSelection is true (fallback for existing apps)', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
Expand All@@ -390,6 +402,48 @@ describe('OAuthConsent', () => {
 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });

 const { getByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(getByText('Acme Corp')).toBeVisible();
 });
 });

 it('does not display user:org:read in the scopes list', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { queryByText } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
 expect(queryByText('Access your organizations')).toBeNull();
 });
 });

 it('includes a hidden organization_id input when user:org:read scope is present and user has memberships', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({
 email_addresses: ['jane@example.com'],
 organization_memberships: [{ id: 'org_1', name: 'Acme Corp' }],
 });
 f.withOrganizations();
 });

 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

 await waitFor(() => {
Expand All@@ -400,7 +454,7 @@ describe('OAuthConsent', () => {
 });
 });

 it('does not include organization_id in the form when org selection is disabled', async () => {
 it('does not include organization_id in the form when user:org:read scope is absent', async () => {
 const { wrapper, fixtures, props } = await createFixtures(f => {
 f.withUser({ email_addresses: ['jane@example.com'] });
 });
Expand DownExpand Up@@ -431,8 +485,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_3';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -458,8 +514,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = 'org_deleted';

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand All@@ -485,8 +543,10 @@ describe('OAuthConsent', () => {

 fixtures.clerk.session.lastActiveOrganizationId = null;

 props.setProps({ componentName: 'OAuthConsent', __internal_enableOrgSelection: true } as any);
 mockOAuthApplication(fixtures.clerk, { getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfo) });
 props.setProps({ componentName: 'OAuthConsent' } as any);
 mockOAuthApplication(fixtures.clerk, {
 getConsentInfo: vi.fn().mockResolvedValue(fakeConsentInfoWithOrgScope),
 });

 const { baseElement } = render(<OAuthConsent />, { wrapper });

Expand Down
Loading