Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/electron/src/global.d.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { TokenCache } from './shared/types';
import type { OAuthTransport, TokenCache } from './shared/types';

declare const PACKAGE_NAME: string;
declare const PACKAGE_VERSION: string;
Expand All@@ -8,6 +8,7 @@ declare global {
interface Window {
__clerk_internal_electron?: {
tokenCache: TokenCache;
oauthTransport: OAuthTransport;
};
}
}
83 changes: 82 additions & 1 deletion packages/electron/src/main/__tests__/setup-main.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
import { ipcMain, protocol } from 'electron';
import { app, ipcMain, protocol, shell } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { OAUTH_TRANSPORT_CHANNELS } from '../../shared/ipc';
import type { TokenStorage } from '../../shared/types';
import { setupMain } from '../setup-main';

vi.mock('electron', () => ({
app: {
on: vi.fn(),
removeListener: vi.fn(),
setAsDefaultProtocolClient: vi.fn(),
},
ipcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
protocol: {
registerSchemesAsPrivileged: vi.fn(),
},
shell: {
openExternal: vi.fn(),
},
}));

describe('setupMain', () => {
Expand DownExpand Up@@ -90,4 +99,76 @@ describe('setupMain', () => {

expect(ipcMain.removeHandler).toHaveBeenCalledTimes(3);
});

it('cleans up OAuth transport handlers when renderer origin is configured', () => {
const clerk = setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

clerk.cleanup();

expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcMain.removeHandler).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open);
expect(app.removeListener).toHaveBeenCalledWith('open-url', expect.any(Function));
expect(app.removeListener).toHaveBeenCalledWith('second-instance', expect.any(Function));
});

it('sets up OAuth transport IPC handlers when renderer origin is configured', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, expect.any(Function));
expect(ipcMain.handle).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.open, expect.any(Function));
expect(app.setAsDefaultProtocolClient).toHaveBeenCalledWith('my-app');
});

it('derives the OAuth callback URL from the renderer origin', () => {
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const getRedirectUrlHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.getRedirectUrl;
})?.[1];

expect(getRedirectUrlHandler?.({} as Electron.IpcMainInvokeEvent)).toBe('my-app://renderer/');
});

it('opens OAuth URLs externally and resolves with the matching deep-link callback URL', async () => {
vi.mocked(shell.openExternal).mockResolvedValue(undefined);
setupMain({
storage,
renderer: {
host: 'renderer',
scheme: 'my-app',
},
});

const openHandler = vi.mocked(ipcMain.handle).mock.calls.find(([channel]) => {
return channel === OAUTH_TRANSPORT_CHANNELS.open;
})?.[1];
const openPromise = openHandler?.({} as Electron.IpcMainInvokeEvent, 'https://accounts.example.com/oauth');
const openUrlListener = vi.mocked(app.on).mock.calls.find(([event]) => event === 'open-url')?.[1] as (
event: Electron.Event,
url: string,
) => void;

openUrlListener({ preventDefault: vi.fn() } as unknown as Electron.Event, 'my-app://renderer/?code=123');

await expect(openPromise).resolves.toEqual({ callbackUrl: 'my-app://renderer/?code=123' });
expect(shell.openExternal).toHaveBeenCalledWith('https://accounts.example.com/oauth');
});
});
130 changes: 130 additions & 0 deletions packages/electron/src/main/oauth-transport.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
import { app, ipcMain, shell } from 'electron';

import { OAUTH_TRANSPORT_CHANNELS } from '../shared/ipc';
import type { RendererSchemeOptions } from '../shared/types';

const CALLBACK_TIMEOUT_MS = 3 * 60 * 1000;

type PendingOAuthFlow = {
resolve: (value: { callbackUrl: string }) => void;
reject: (reason: Error) => void;
timeout: NodeJS.Timeout;
};

type OAuthTransportOptions = {
renderer: RendererSchemeOptions;
};

function buildRedirectUrl(options: OAuthTransportOptions): string {
return `${options.renderer.scheme}://${options.renderer.host}/`;
}

function isMatchingCallbackUrl(url: string, redirectUrl: string): boolean {
try {
const callback = new URL(url);
const expected = new URL(redirectUrl);

return (
callback.protocol === expected.protocol &&
callback.host === expected.host &&
callback.pathname === expected.pathname
);
} catch {
return false;
}
}

function assertExternalOAuthUrl(url: string): void {
const parsedUrl = new URL(url);

if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
throw new TypeError(`Clerk: refusing to open unsupported OAuth URL protocol: ${parsedUrl.protocol}`);
}
}

export function setupOAuthTransportIpcHandlers(options: OAuthTransportOptions): () => void {
const redirectUrl = buildRedirectUrl(options);
let pendingOAuthFlow: PendingOAuthFlow | null = null;

const disposePendingOAuthFlow = (reason?: Error): void => {
if (!pendingOAuthFlow) {
return;
}

const pending = pendingOAuthFlow;
clearTimeout(pendingOAuthFlow.timeout);
pendingOAuthFlow = null;

if (reason) {
pending.reject(reason);
}
};

const handleCallbackUrl = (url: string): void => {
if (!pendingOAuthFlow || !isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

const pending = pendingOAuthFlow;
disposePendingOAuthFlow();
pending.resolve({ callbackUrl: url });
};

const openUrlListener = (event: Electron.Event, url: string): void => {
if (!isMatchingCallbackUrl(url, redirectUrl)) {
return;
}

event.preventDefault();
handleCallbackUrl(url);
};

const secondInstanceListener = (_event: Electron.Event, argv: string[]): void => {
const callbackUrl = argv.find(url => isMatchingCallbackUrl(url, redirectUrl));

if (callbackUrl) {
handleCallbackUrl(callbackUrl);
}
};

app.setAsDefaultProtocolClient(options.renderer.scheme);
app.on('open-url', openUrlListener);
app.on('second-instance', secondInstanceListener);

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl, () => {
return redirectUrl;
});

ipcMain.handle(OAUTH_TRANSPORT_CHANNELS.open, async (_event, url: string) => {
if (pendingOAuthFlow) {
throw new Error('Clerk: an OAuth flow is already pending.');
}

assertExternalOAuthUrl(url);

const callbackPromise = new Promise<{ callbackUrl: string }>((resolve, reject) => {
const timeout = setTimeout(() => {
disposePendingOAuthFlow();
reject(new Error('Clerk: OAuth callback timed out.'));
}, CALLBACK_TIMEOUT_MS);

pendingOAuthFlow = { resolve, reject, timeout };
});

try {
await shell.openExternal(url);
} catch (err) {
disposePendingOAuthFlow(err instanceof Error ? err : new Error(String(err)));
}

return callbackPromise;
});

return () => {
disposePendingOAuthFlow(new Error('Clerk: OAuth flow was cancelled.'));
app.removeListener('open-url', openUrlListener);
app.removeListener('second-instance', secondInstanceListener);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
ipcMain.removeHandler(OAUTH_TRANSPORT_CHANNELS.open);
};
}
7 changes: 7 additions & 0 deletions packages/electron/src/main/setup-main.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import { protocol } from 'electron';

import type { SetupMainOptions, SetupMainReturn } from '../shared/types';
import { setupTokenCacheIpcHandlers } from './ipc-handlers';
import { setupOAuthTransportIpcHandlers } from './oauth-transport';

function assertValidRendererOriginConfig(renderer: NonNullable<SetupMainOptions['renderer']>): void {
if (renderer.scheme.includes(':') || renderer.scheme.includes('/')) {
Expand All@@ -25,6 +26,7 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
}

const cleanupTokenPersistence = setupTokenCacheIpcHandlers(options.storage);
let cleanupOAuthTransport: (() => void) | undefined;

if (options.renderer) {
assertValidRendererOriginConfig(options.renderer);
Expand All@@ -41,11 +43,16 @@ export function setupMain(options: SetupMainOptions): SetupMainReturn {
},
},
]);

cleanupOAuthTransport = setupOAuthTransportIpcHandlers({
renderer: options.renderer,
});
}

return {
cleanup() {
cleanupTokenPersistence();
cleanupOAuthTransport?.();
},
};
}
26 changes: 25 additions & 1 deletion packages/electron/src/preload/__tests__/index.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { contextBridge, ipcRenderer } from 'electron';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';

import { TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../../shared/ipc';
import { setupPreload } from '../index';

vi.mock('electron', () => ({
Expand DownExpand Up@@ -39,6 +39,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
},
oauthTransport: {
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
},
});
});

Expand All@@ -52,6 +56,10 @@ describe('setupPreload', () => {
saveToken: expect.any(Function),
clearToken: expect.any(Function),
});
expect(window.__clerk_internal_electron?.oauthTransport).toEqual({
getRedirectUrl: expect.any(Function),
open: expect.any(Function),
});
});

it('forwards token cache calls over IPC', async () => {
Expand All@@ -68,4 +76,20 @@ describe('setupPreload', () => {
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.saveToken, 'token-key', 'jwt');
expect(ipcRenderer.invoke).toHaveBeenCalledWith(TOKEN_CACHE_CHANNELS.clearToken, 'token-key');
});

it('forwards OAuth transport calls over IPC', async () => {
setupPreload();

const bridge = vi.mocked(contextBridge.exposeInMainWorld).mock
.calls[0][1] as typeof window.__clerk_internal_electron;

await bridge?.oauthTransport.getRedirectUrl();
await bridge?.oauthTransport.open('https://accounts.example.com/oauth');

expect(ipcRenderer.invoke).toHaveBeenCalledWith(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl);
expect(ipcRenderer.invoke).toHaveBeenCalledWith(
OAUTH_TRANSPORT_CHANNELS.open,
'https://accounts.example.com/oauth',
);
});
});
13 changes: 9 additions & 4 deletions packages/electron/src/preload/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
import { contextBridge, ipcRenderer } from 'electron';

import { TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { TokenCache } from '../shared/types';
import { OAUTH_TRANSPORT_CHANNELS, TOKEN_CACHE_CHANNELS } from '../shared/ipc';
import type { OAuthTransport, TokenCache } from '../shared/types';

export function setupPreload(): void {
const tokenCache: TokenCache = {
getToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.getToken, key),
saveToken: (key, value) => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.saveToken, key, value),
clearToken: key => ipcRenderer.invoke(TOKEN_CACHE_CHANNELS.clearToken, key),
};
const oauthTransport: OAuthTransport = {
getRedirectUrl: () => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.getRedirectUrl),
open: url => ipcRenderer.invoke(OAUTH_TRANSPORT_CHANNELS.open, url),
};
const bridge = { tokenCache, oauthTransport };

if (process.contextIsolated) {
contextBridge.exposeInMainWorld('__clerk_internal_electron', { tokenCache });
contextBridge.exposeInMainWorld('__clerk_internal_electron', bridge);
} else {
window.__clerk_internal_electron = { tokenCache };
window.__clerk_internal_electron = bridge;
}
}
Loading
Loading