|
| 1 | +diff --git a/dist/cjs/index.js b/dist/cjs/index.js |
| 2 | +index 97a5a25d58584c9bf04997fcec67e29923a0cf76..8fa6d6422188dc720e6de3672ba77e79617526bd 100644 |
| 3 | +--- a/dist/cjs/index.js |
| 4 | ++++ b/dist/cjs/index.js |
| 5 | +@@ -95,8 +95,8 @@ function setupOAuthTransportIpcHandlers(options) { |
| 6 | + }); |
| 7 | + electron.ipcMain.handle(require_ipc.OAUTH_TRANSPORT_CHANNELS.open, async (event, url) => { |
| 8 | + if (!isMainFrameEvent(event)) throw new Error("Clerk: OAuth request did not originate from a window's main frame."); |
| 9 | +- if (pendingOAuthFlow) throw new Error("Clerk: an OAuth flow is already pending."); |
| 10 | + assertExternalOAuthUrl(url); |
| 11 | ++ disposePendingOAuthFlow(new Error("Clerk: OAuth flow was replaced by a new one.")); |
| 12 | + const window = electron.BrowserWindow.fromWebContents(event.sender); |
| 13 | + const callbackPromise = new Promise((resolve, reject) => { |
| 14 | + pendingOAuthFlow = { |
| 15 | +@@ -109,10 +109,13 @@ function setupOAuthTransportIpcHandlers(options) { |
| 16 | + window |
| 17 | + }; |
| 18 | + }); |
| 19 | ++ const flow = pendingOAuthFlow; |
| 20 | ++ // A newer flow can reject this one before it is returned below. |
| 21 | ++ callbackPromise.catch(() => {}); |
| 22 | + try { |
| 23 | + await electron.shell.openExternal(url); |
| 24 | + } catch (err) { |
| 25 | +- disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err))); |
| 26 | ++ if (pendingOAuthFlow === flow) disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err))); |
| 27 | + } |
| 28 | + return callbackPromise; |
| 29 | + }); |
| 30 | +diff --git a/dist/cjs/preload/index.js b/dist/cjs/preload/index.js |
| 31 | +index 310c21a720e7b5da06ee301f6b51597f081a8179..3518d29e786258065bc5ab92b664ea06dc99b659 100644 |
| 32 | +--- a/dist/cjs/preload/index.js |
| 33 | ++++ b/dist/cjs/preload/index.js |
| 34 | +@@ -33,7 +33,7 @@ function exposeClerkBridge(options) { |
| 35 | + }, |
| 36 | + oauthTransport: { |
| 37 | + getRedirectUrl: () => electron.ipcRenderer.invoke(require_ipc.OAUTH_TRANSPORT_CHANNELS.getRedirectUrl), |
| 38 | +- open: (url) => electron.ipcRenderer.invoke(require_ipc.OAUTH_TRANSPORT_CHANNELS.open, url) |
| 39 | ++ open: (options?.wrapOAuthOpen ?? ((open) => open))((url) => electron.ipcRenderer.invoke(require_ipc.OAUTH_TRANSPORT_CHANNELS.open, url)) |
| 40 | + } |
| 41 | + }; |
| 42 | + if (process.contextIsolated) electron.contextBridge.exposeInMainWorld("__clerk_internal_electron", bridge); |
| 43 | +diff --git a/dist/esm/index.js b/dist/esm/index.js |
| 44 | +index 29284ea0e6325afc72024ec8c2e69ab3cb78ad00..80c64fd8dbaefb4a393cc814a273620f77ca76c6 100644 |
| 45 | +--- a/dist/esm/index.js |
| 46 | ++++ b/dist/esm/index.js |
| 47 | +@@ -94,8 +94,8 @@ function setupOAuthTransportIpcHandlers(options) { |
| 48 | + }); |
| 49 | + ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (event, url) => { |
| 50 | + if (!isMainFrameEvent(event)) throw new Error("Clerk: OAuth request did not originate from a window's main frame."); |
| 51 | +- if (pendingOAuthFlow) throw new Error("Clerk: an OAuth flow is already pending."); |
| 52 | + assertExternalOAuthUrl(url); |
| 53 | ++ disposePendingOAuthFlow(new Error("Clerk: OAuth flow was replaced by a new one.")); |
| 54 | + const window = BrowserWindow.fromWebContents(event.sender); |
| 55 | + const callbackPromise = new Promise((resolve, reject) => { |
| 56 | + pendingOAuthFlow = { |
| 57 | +@@ -108,10 +108,13 @@ function setupOAuthTransportIpcHandlers(options) { |
| 58 | + window |
| 59 | + }; |
| 60 | + }); |
| 61 | ++ const flow = pendingOAuthFlow; |
| 62 | ++ // A newer flow can reject this one before it is returned below. |
| 63 | ++ callbackPromise.catch(() => {}); |
| 64 | + try { |
| 65 | + await shell.openExternal(url); |
| 66 | + } catch (err) { |
| 67 | +- disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err))); |
| 68 | ++ if (pendingOAuthFlow === flow) disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err))); |
| 69 | + } |
| 70 | + return callbackPromise; |
| 71 | + }); |
| 72 | +diff --git a/dist/esm/preload/index.js b/dist/esm/preload/index.js |
| 73 | +index 4a131a7d148fb402fe5e04336ccf7398723501b4..110dab808a7c6a1a7664dc5d9ab254af2fa4c4bc 100644 |
| 74 | +--- a/dist/esm/preload/index.js |
| 75 | ++++ b/dist/esm/preload/index.js |
| 76 | +@@ -32,7 +32,7 @@ function exposeClerkBridge(options) { |
| 77 | + }, |
| 78 | + oauthTransport: { |
| 79 | + getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl), |
| 80 | +- open: (url) => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url) |
| 81 | ++ open: (options?.wrapOAuthOpen ?? ((open) => open))((url) => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url)) |
| 82 | + } |
| 83 | + }; |
| 84 | + if (process.contextIsolated) contextBridge.exposeInMainWorld("__clerk_internal_electron", bridge); |
| 85 | +diff --git a/dist/types/shared/types.d.ts b/dist/types/shared/types.d.ts |
| 86 | +index ed127cc9e02808600b7f51dd71b278e223180534..96b6cc803a4e245f9966237003511b3cbe2121c8 100644 |
| 87 | +--- a/dist/types/shared/types.d.ts |
| 88 | ++++ b/dist/types/shared/types.d.ts |
| 89 | +@@ -40,6 +40,14 @@ export type ExposeClerkBridgeOptions = { |
| 90 | + * Exposes the native passkey bridge to the renderer. Requires `createClerkBridge({ passkeys: true })`. |
| 91 | + */ |
| 92 | + passkeys?: boolean; |
| 93 | ++ /** |
| 94 | ++ * Wraps the renderer's OAuth open call, for example to let the app cancel a pending flow. |
| 95 | ++ */ |
| 96 | ++ wrapOAuthOpen?: (open: (url: string) => Promise<{ |
| 97 | ++ callbackUrl: string; |
| 98 | ++ }>) => (url: string) => Promise<{ |
| 99 | ++ callbackUrl: string; |
| 100 | ++ }>; |
| 101 | + }; |
| 102 | + export type ClerkBridge = { |
| 103 | + /** |
0 commit comments