Commit f2d5fc9

Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9

4 files changed

Lines changed: 105 additions & 44 deletions

File tree

‎apps/web/src/components/clerk/electronPasskeys.test.ts‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});

‎apps/web/src/main.tsx‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}

‎pnpm-lock.yaml‎

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pnpm-workspace.yaml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
- "@clerk/backend@3.14.0"
5757
- "@clerk/clerk-js@6.29.2"
58-
- "@clerk/electron@0.0.33"
58+
- "@clerk/electron@0.0.34-canary.v20260819050620"
59+
- "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
- "@clerk/expo@4.2.0"
6061
- "@clerk/react@6.14.4"
6162
- "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
- alchemy@2.0.0-beta.65
7778
- effect@4.0.0-beta.103
7879
- "@legendapp/list@3.3.5"
80+
- "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
- "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
- "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
- "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"

0 commit comments

Comments
 (0)
, '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
Commit f2d5fc9
Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9
4 files changed
Lines changed: 105 additions & 44 deletions
File tree
‎apps/web/src/components/clerk/electronPasskeys.test.ts‎
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
 get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
 publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
 publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});
‎apps/web/src/main.tsx‎
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
 ...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}
‎pnpm-lock.yaml‎
Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
‎pnpm-workspace.yaml‎
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
 - "@clerk/backend@3.14.0"
5757
 - "@clerk/clerk-js@6.29.2"
58-
 - "@clerk/electron@0.0.33"
58+
 - "@clerk/electron@0.0.34-canary.v20260819050620"
59+
 - "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
 - "@clerk/expo@4.2.0"
6061
 - "@clerk/react@6.14.4"
6162
 - "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
 - alchemy@2.0.0-beta.65
7778
 - effect@4.0.0-beta.103
7879
 - "@legendapp/list@3.3.5"
80+
 - "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
 - "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
 - "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
 - "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"
0 commit comments
Comments
 (0)

, '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
Commit f2d5fc9
Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9
4 files changed
Lines changed: 105 additions & 44 deletions
File tree
‎apps/web/src/components/clerk/electronPasskeys.test.ts‎
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
 get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
 publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
 publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});
‎apps/web/src/main.tsx‎
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
 ...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}
‎pnpm-lock.yaml‎
Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
‎pnpm-workspace.yaml‎
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
 - "@clerk/backend@3.14.0"
5757
 - "@clerk/clerk-js@6.29.2"
58-
 - "@clerk/electron@0.0.33"
58+
 - "@clerk/electron@0.0.34-canary.v20260819050620"
59+
 - "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
 - "@clerk/expo@4.2.0"
6061
 - "@clerk/react@6.14.4"
6162
 - "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
 - alchemy@2.0.0-beta.65
7778
 - effect@4.0.0-beta.103
7879
 - "@legendapp/list@3.3.5"
80+
 - "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
 - "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
 - "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
 - "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"
0 commit comments
Comments
 (0)

, '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
Commit f2d5fc9
Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9
4 files changed
Lines changed: 105 additions & 44 deletions
File tree
‎apps/web/src/components/clerk/electronPasskeys.test.ts‎
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
 get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
 publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
 publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});
‎apps/web/src/main.tsx‎
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
 ...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}
‎pnpm-lock.yaml‎
Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
‎pnpm-workspace.yaml‎
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
 - "@clerk/backend@3.14.0"
5757
 - "@clerk/clerk-js@6.29.2"
58-
 - "@clerk/electron@0.0.33"
58+
 - "@clerk/electron@0.0.34-canary.v20260819050620"
59+
 - "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
 - "@clerk/expo@4.2.0"
6061
 - "@clerk/react@6.14.4"
6162
 - "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
 - alchemy@2.0.0-beta.65
7778
 - effect@4.0.0-beta.103
7879
 - "@legendapp/list@3.3.5"
80+
 - "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
 - "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
 - "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
 - "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"
0 commit comments
Comments
 (0)

, '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
Commit f2d5fc9
Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9
4 files changed
Lines changed: 105 additions & 44 deletions
File tree
‎apps/web/src/components/clerk/electronPasskeys.test.ts‎
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
 get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
 publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
 publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});
‎apps/web/src/main.tsx‎
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
 ...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}
‎pnpm-lock.yaml‎
Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
‎pnpm-workspace.yaml‎
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
 - "@clerk/backend@3.14.0"
5757
 - "@clerk/clerk-js@6.29.2"
58-
 - "@clerk/electron@0.0.33"
58+
 - "@clerk/electron@0.0.34-canary.v20260819050620"
59+
 - "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
 - "@clerk/expo@4.2.0"
6061
 - "@clerk/react@6.14.4"
6162
 - "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
 - alchemy@2.0.0-beta.65
7778
 - effect@4.0.0-beta.103
7879
 - "@legendapp/list@3.3.5"
80+
 - "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
 - "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
 - "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
 - "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"
0 commit comments
Comments
 (0)

, '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
Commit f2d5fc9
Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9
4 files changed
Lines changed: 105 additions & 44 deletions
File tree
‎apps/web/src/components/clerk/electronPasskeys.test.ts‎
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
 get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
 publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
 publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});
‎apps/web/src/main.tsx‎
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
 ...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}
‎pnpm-lock.yaml‎
Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
‎pnpm-workspace.yaml‎
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
 - "@clerk/backend@3.14.0"
5757
 - "@clerk/clerk-js@6.29.2"
58-
 - "@clerk/electron@0.0.33"
58+
 - "@clerk/electron@0.0.34-canary.v20260819050620"
59+
 - "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
 - "@clerk/expo@4.2.0"
6061
 - "@clerk/react@6.14.4"
6162
 - "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
 - alchemy@2.0.0-beta.65
7778
 - effect@4.0.0-beta.103
7879
 - "@legendapp/list@3.3.5"
80+
 - "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
 - "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
 - "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
 - "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"
0 commit comments
Comments
 (0)

, '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
Commit f2d5fc9
Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9
4 files changed
Lines changed: 105 additions & 44 deletions
File tree
‎apps/web/src/components/clerk/electronPasskeys.test.ts‎
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
 get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
 publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
 publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});
‎apps/web/src/main.tsx‎
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
 ...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}
‎pnpm-lock.yaml‎
Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
‎pnpm-workspace.yaml‎
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
 - "@clerk/backend@3.14.0"
5757
 - "@clerk/clerk-js@6.29.2"
58-
 - "@clerk/electron@0.0.33"
58+
 - "@clerk/electron@0.0.34-canary.v20260819050620"
59+
 - "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
 - "@clerk/expo@4.2.0"
6061
 - "@clerk/react@6.14.4"
6162
 - "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
 - alchemy@2.0.0-beta.65
7778
 - effect@4.0.0-beta.103
7879
 - "@legendapp/list@3.3.5"
80+
 - "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
 - "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
 - "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
 - "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"
0 commit comments
Comments
 (0)

, '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
Commit f2d5fc9
Browse files
t3dotggt3dotgg
authored
fix(desktop): stop automatic passkey prompts (#7522)
1 parent 24c4ba6 commit f2d5fc9
4 files changed
Lines changed: 105 additions & 44 deletions
File tree
‎apps/web/src/components/clerk/electronPasskeys.test.ts‎
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import{createPasskeys}from"@clerk/electron/passkeys";
2+
import{afterEach,describe,expect,it,vi}from"vite-plus/test";
3+
4+
constpublicKeyOptions={
5+
allowCredentials: [],
6+
challenge: newUint8Array([1]),
7+
rpId: "clerk.t3.codes",
8+
timeout: 60_000,
9+
userVerification: "preferred"asconst,
10+
};
11+
12+
conststubNativePasskeys=()=>{
13+
constget=vi.fn().mockResolvedValue({
14+
ok: false,
15+
error: {code: "cancelled",message: "user cancelled"},
16+
});
17+
18+
vi.stubGlobal("location",{protocol: "t3code:",hostname: "app"});
19+
vi.stubGlobal("window",{
20+
PublicKeyCredential: vi.fn(),
21+
__clerk_internal_electron_passkeys: {
22+
platform: "darwin",
23+
electronMajor: 41,
24+
 get,
25+
},
26+
});
27+
28+
returnget;
29+
};
30+
31+
describe("Electron passkeys",()=>{
32+
afterEach(()=>{
33+
vi.unstubAllGlobals();
34+
});
35+
36+
it("does not send an autofill request to the native bridge",async()=>{
37+
constget=stubNativePasskeys();
38+
constpasskeys=createPasskeys();
39+
40+
constresult=awaitpasskeys.get({
41+
 publicKeyOptions,
42+
conditionalUI: true,
43+
});
44+
45+
expect(get).not.toHaveBeenCalled();
46+
expect(result.error).toMatchObject({code: "passkey_operation_aborted"});
47+
});
48+
49+
it("sends an explicit passkey request to the native bridge",async()=>{
50+
constget=stubNativePasskeys();
51+
constpasskeys=createPasskeys();
52+
53+
awaitpasskeys.get({
54+
 publicKeyOptions,
55+
conditionalUI: false,
56+
});
57+
58+
expect(get).toHaveBeenCalledOnce();
59+
});
60+
});
‎apps/web/src/main.tsx‎
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReactfrom"react";
22
importReactDOMfrom"react-dom/client";
33
import{ClerkProvider}from"@clerk/react";
4-
import{passkeysaselectronPasskeys}from"@clerk/electron/passkeys";
4+
import{passkeys}from"@clerk/electron/passkeys";
55
import{ClerkProviderasElectronClerkProvider}from"@clerk/electron/react";
66
import{createHashHistory,createBrowserHistory}from"@tanstack/react-router";
77

@@ -30,14 +30,9 @@ if (isElectron) {
3030

3131
constclerkPublishableKey=import.meta.env.VITE_CLERK_PUBLISHABLE_KEYasstring|undefined;
3232

33-
// @clerk/electron reports passkey autofill as supported but executes the
34-
// "quiet" autofill request as a modal prompt, so Clerk's sign-in form pops an
35-
// OS passkey dialog the moment it mounts. Report autofill as unsupported; the
36-
// explicit "Use passkey" button keeps working.
37-
// Upstream: https://github.com/clerk/javascript/issues/9496
38-
constpasskeys={
39-
 ...electronPasskeys,
40-
isAutoFillSupported: ()=>Promise.resolve(false),
33+
// First Clerk UI build containing https://github.com/clerk/javascript/pull/9500.
34+
constelectronClerkUI={
35+
__internal_clerkUIVersion: "1.30.5-canary.v20260819050620",
4136
};
4237

4338
constapp=<AppRootrouter={router}/>;
@@ -47,6 +42,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
4742
{clerkPublishableKey&&hasCloudPublicConfig() ? (
4843
isElectron ? (
4944
<ElectronClerkProvider
45+
{...electronClerkUI}
5046
appearance={clerkAppearance}
5147
publishableKey={clerkPublishableKey}
5248
passkeys={passkeys}
‎pnpm-lock.yaml‎
Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
‎pnpm-workspace.yaml‎
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ allowBuilds:
2525
catalog:
2626
"@clerk/backend": 3.14.0
2727
"@clerk/clerk-js": 6.29.2
28-
"@clerk/electron": 0.0.33
29-
"@clerk/electron-passkeys": 0.0.3
28+
"@clerk/electron": 0.0.34-canary.v20260819050620
29+
"@clerk/electron-passkeys": 0.0.4-canary.v20260819050620
3030
"@clerk/expo": 4.2.0
3131
"@clerk/react": 6.14.4
3232
"@clerk/shared": 4.29.2
@@ -55,7 +55,8 @@ catalog:
5555
minimumReleaseAgeExclude:
5656
 - "@clerk/backend@3.14.0"
5757
 - "@clerk/clerk-js@6.29.2"
58-
 - "@clerk/electron@0.0.33"
58+
 - "@clerk/electron@0.0.34-canary.v20260819050620"
59+
 - "@clerk/electron-passkeys@0.0.4-canary.v20260819050620"
5960
 - "@clerk/expo@4.2.0"
6061
 - "@clerk/react@6.14.4"
6162
 - "@clerk/shared@4.29.2"
@@ -76,6 +77,10 @@ minimumReleaseAgeExclude:
7677
 - alchemy@2.0.0-beta.65
7778
 - effect@4.0.0-beta.103
7879
 - "@legendapp/list@3.3.5"
80+
 - "@clerk/electron-passkeys-darwin-arm64@0.0.4-canary.v20260819050620"
81+
 - "@clerk/electron-passkeys-darwin-x64@0.0.4-canary.v20260819050620"
82+
 - "@clerk/electron-passkeys-win32-arm64-msvc@0.0.4-canary.v20260819050620"
83+
 - "@clerk/electron-passkeys-win32-x64-msvc@0.0.4-canary.v20260819050620"
7984

8085
overrides:
8186
"@clerk/backend": "catalog:"
0 commit comments
Comments
 (0)