Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d9c58fd
feat(clerk-js): Add OAuthConsent component and related functionality
alexcarpenter May 28, 2025
884cd8d
init
alexcarpenter May 28, 2025
e888567
wip
alexcarpenter May 28, 2025
deaf773
wip
alexcarpenter May 28, 2025
8e0475b
wip
alexcarpenter May 28, 2025
5aad8a2
wip
alexcarpenter May 28, 2025
f4ad497
types
alexcarpenter May 28, 2025
a989671
add initial props
wobsoriano May 28, 2025
af16405
add oauth logo url prop and make avatars functional
wobsoriano May 29, 2025
0c5867c
use oauth context for props
wobsoriano May 29, 2025
b01a50b
use correct logo for oauth app
wobsoriano May 29, 2025
c5b4990
render url with tooltip
wobsoriano May 29, 2025
0ee9566
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 29, 2025
08604df
update tooltip colors
alexcarpenter May 29, 2025
6fbb373
fix list item alignment
alexcarpenter May 29, 2025
96f5562
fix alignment
alexcarpenter May 29, 2025
ec2c1df
fix gaps
alexcarpenter May 29, 2025
5092eb1
chore: use root domain
wobsoriano May 30, 2025
2f5fe86
chore: display full url in modal
wobsoriano May 30, 2025
52f2cf8
chore: remove unused style
wobsoriano May 30, 2025
dc441f6
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
1c43ad8
add header to redirect url modal
wobsoriano May 30, 2025
4727ec6
chore: increase textarea height
wobsoriano May 30, 2025
92b9b8c
chore: clean up and trigger CI
wobsoriano May 30, 2025
7e345c9
chore: add changesets
wobsoriano May 30, 2025
5e76a35
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano May 30, 2025
332b5e2
increase clerk.js max size
wobsoriano May 30, 2025
f049102
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano May 30, 2025
c6f2764
increase clerk.js max size
wobsoriano May 30, 2025
2172f01
chore: handle empty or invalid redirect uri
wobsoriano May 30, 2025
1ba557c
fix sandbox prop
wobsoriano May 30, 2025
eb0e8ee
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 2, 2025
55ab8b9
move confirm info location
wobsoriano Jun 3, 2025
5312875
update icon
wobsoriano Jun 3, 2025
df6171a
Update packages/clerk-js/src/ui/components/OAuthConsent/OAuthConsent.tsx
wobsoriano Jun 3, 2025
2fbdc4d
Apply suggestions from code review
wobsoriano Jun 3, 2025
1020e87
Update packages/clerk-js/src/ui/icons/lock-dotted-circle.svg
wobsoriano Jun 3, 2025
41d2153
chore: remove barrel files
wobsoriano Jun 3, 2025
f8db087
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
60b30d9
fix new imports
wobsoriano Jun 3, 2025
c55f85c
update all imports to use new prefix
wobsoriano Jun 3, 2025
c03affb
remove unused icon
wobsoriano Jun 3, 2025
50599b7
fix bundle size
wobsoriano Jun 3, 2025
4e714c5
chore: update changeset
wobsoriano Jun 3, 2025
4d3e1ee
chore: remove extra changeset
wobsoriano Jun 3, 2025
54c1a0e
chore: make appearance type internal
wobsoriano Jun 3, 2025
9b84e46
Merge branch 'main' into alexcarpenter/oauth-consent-component
wobsoriano Jun 3, 2025
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
7 changes: 7 additions & 0 deletions .changeset/six-crabs-carry.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think patch is good since this is internal only

'@clerk/clerk-react': patch
'@clerk/types': patch
---

Introduce internal `<OAuthConsent />` component to be used internally in the machine auth OAuth flow in account portal.
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@
{ "path": "./dist/clerk.browser.js", "maxSize": "69KB" },
{ "path": "./dist/clerk.legacy.browser.js", "maxSize": "113KB" },
{ "path": "./dist/clerk.headless*.js", "maxSize": "52KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106KB" },
{ "path": "./dist/ui-common*.js", "maxSize": "106.1KB" },
{ "path": "./dist/vendors*.js", "maxSize": "39.8KB" },
{ "path": "./dist/coinbase*.js", "maxSize": "38KB" },
{ "path": "./dist/createorganization*.js", "maxSize": "5KB" },
Expand Down
17 changes: 17 additions & 0 deletions packages/clerk-js/sandbox/app.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@ const AVAILABLE_COMPONENTS = [
'organizationSwitcher',
'waitlist',
'pricingTable',
'oauthConsent',
] as const;

const COMPONENT_PROPS_NAMESPACE = 'clerk-js-sandbox';
Expand DownExpand Up@@ -91,6 +92,7 @@ const componentControls: Record<(typeof AVAILABLE_COMPONENTS)[number], Component
organizationSwitcher: buildComponentControls('organizationSwitcher'),
waitlist: buildComponentControls('waitlist'),
pricingTable: buildComponentControls('pricingTable'),
oauthConsent: buildComponentControls('oauthConsent'),
};

declare global {
Expand DownExpand Up@@ -310,6 +312,21 @@ void (async () => {
'/pricing-table': () => {
Clerk.mountPricingTable(app, componentControls.pricingTable.getProps() ?? {});
},
'/oauth-consent': () => {
const searchParams = new URLSearchParams(window.location.search);
const scopes = (searchParams.get('scopes')?.split(',') ?? []).map(scope => ({
scope,
description: `Grants access to your ${scope}`,
}));
Comment on lines +316 to +320

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

for testing purposes

Clerk.__internal_mountOAuthConsent(
app,
componentControls.oauthConsent.getProps() ?? {
scopes,
oAuthApplicationName: searchParams.get('oauth-application-name'),
redirectUrl: searchParams.get('redirect_uri'),
},
);
},
'/open-sign-in': () => {
mountOpenSignInButton(app, componentControls.signIn.getProps() ?? {});
},
Expand Down
8 changes: 8 additions & 0 deletions packages/clerk-js/sandbox/template.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -260,6 +260,14 @@
PricingTable
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
href="/oauth-consent"
>
OAuthConsent
</a>
</li>
<li class="relative">
<a
class="relative isolate flex w-full rounded-md border border-white px-2 py-[0.4375rem] text-sm hover:bg-gray-50 aria-[current]:bg-gray-50"
Expand Down
18 changes: 18 additions & 0 deletions packages/clerk-js/src/core/clerk.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import { allSettled, handleValueOrFn, noop } from '@clerk/shared/utils';
import type {
__internal_CheckoutProps,
__internal_ComponentNavigationContext,
__internal_OAuthConsentProps,
__internal_PlanDetailsProps,
__internal_UserVerificationModalProps,
AuthenticateWithCoinbaseWalletParams,
Expand DownExpand Up@@ -1037,6 +1038,23 @@ export class Clerk implements ClerkInterface {
);
};

public __internal_mountOAuthConsent = (node: HTMLDivElement, props?: __internal_OAuthConsentProps) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted({ preloadHint: 'OAuthConsent' }).then(controls =>
controls.mountComponent({
name: 'OAuthConsent',
appearanceKey: '__internal_oauthConsent',
node,
props,
}),
);
};

public __internal_unmountOAuthConsent = (node: HTMLDivElement) => {
this.assertComponentsReady(this.#componentControls);
void this.#componentControls.ensureMounted().then(controls => controls.unmountComponent({ node }));
};

/**
* `setActive` can be used to set the active session and/or organization.
*/
Expand Down
Loading