Skip to content
Draft
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
5 changes: 5 additions & 0 deletions .changeset/tanstack-keyless-cli-init-error.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/tanstack-react-start': minor
---

In development, missing Clerk keys no longer activate keyless mode. When `CLERK_PUBLISHABLE_KEY` and `CLERK_SECRET_KEY` are not set, the SDK now fails with an error directing you to run `npx clerk@latest init`, which provisions a Clerk application and writes the keys to `.env`. Existing apps with configured or claimed keys are unaffected.
62 changes: 39 additions & 23 deletions integration/tests/tanstack-start/keyless.test.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { test } from '@playwright/test';
import * as path from 'node:path';

import { expect, test } from '@playwright/test';

import type { Application } from '../../models/application';
import { appConfigs } from '../../presets';
import {
testClaimedAppWithMissingKeys,
testKeylessRemovedAfterEnvAndRestart,
testToggleCollapsePopoverAndClaim,
} from '../../testUtils/keylessHelpers';
import { fs } from '../../scripts';
import { createTestUtils } from '../../testUtils';

const commonSetup = appConfigs.reactRouter.reactRouterNode.clone();
const commonSetup = appConfigs.tanstack.reactStart.clone();

test.describe('Keyless mode @react-router', () => {
test.describe('Keyless mode @tanstack-react-start', () => {
test.describe.configure({ mode: 'serial' });
test.setTimeout(90_000);

Expand All @@ -21,35 +20,52 @@ test.describe('Keyless mode @react-router', () => {
});

let app: Application;
let dashboardUrl = 'https://dashboard.clerk.com/';

test.beforeAll(async () => {
app = await commonSetup.commit();
await app.setup();
await app.withEnv(appConfigs.envs.withKeyless);
if (appConfigs.envs.withKeyless.privateVariables.get('CLERK_API_URL')?.includes('clerkstage')) {
dashboardUrl = 'https://dashboard.clerkstage.dev/';
}
await app.dev();
// Without keys the app 500s on every request, so readiness can't wait for a 2xx
await app.dev({ acceptAnyResponse: true });
});

test.afterAll(async () => {
// Keep files for debugging
await app?.teardown();
});

test('Toggle collapse popover and claim.', async ({ page, context }) => {
await testToggleCollapsePopoverAndClaim({ page, context, app, dashboardUrl, framework: 'react-router' });
});

test('Lands on claimed application with missing explicit keys, expanded by default, click to get keys from dashboard.', async ({
test('Without keys, requests fail with the missing env vars error instead of keyless bootstrap.', async ({
page,
context,
}) => {
await testClaimedAppWithMissingKeys({ page, context, app, dashboardUrl });
const response = await page.goto(`${app.serverUrl}/`);
expect(response?.status()).toBe(500);
await expect(page.getByText('Publishable key is missing').first()).toBeVisible();
await expect(page.getByText('npx clerk@latest init').first()).toBeVisible();
});

test('Keyless popover is removed after adding keys to .env and restarting.', async ({ page, context }) => {
await testKeylessRemovedAfterEnvAndRestart({ page, context, app });
test('Claimed application with keys inside .env boots and serves the app.', async ({ page, context }) => {
/**
* Seed claimed keyless state directly: the SDK no longer mints keys, so write the
* keys fixture to `.clerk/.tmp/keyless.json` and configure the matching environment
* (keys AND api url, so the server-side onboarding-completion call targets the right
* instance). The completion request itself is BAPI-bound from the server, invisible
* to Playwright — its logic is covered by packages/tanstack-react-start keyless unit tests.
*/
const publishableKey = appConfigs.envs.withEmailCodes.publicVariables.get('CLERK_PUBLISHABLE_KEY');
const secretKey = appConfigs.envs.withEmailCodes.privateVariables.get('CLERK_SECRET_KEY');
await fs.ensureDir(path.join(app.appDir, '.clerk', '.tmp'));
await fs.writeJSON(path.join(app.appDir, '.clerk', '.tmp', 'keyless.json'), {
publishableKey,
secretKey,
claimUrl: 'https://dashboard.clerk.com/apps/claim',
apiKeysUrl: 'https://dashboard.clerk.com/last-active?path=api-keys',
});
await app.withEnv(appConfigs.envs.withEmailCodes);
// Restart the dev server to pick up new env vars
await app.restart();

const u = createTestUtils({ app, page, context });
await u.page.goToAppHome();
await u.page.waitForClerkJsLoaded();
await u.po.expect.toBeSignedOut();
});
});
13 changes: 1 addition & 12 deletions packages/tanstack-react-start/src/client/ClerkProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,13 @@ export function ClerkProvider<TUi extends Ui = Ui>({

const clerkInitState = isClient() ? (window as any).__clerk_init_state : clerkInitialState;

const { clerkSsrState, __keylessClaimUrl, __keylessApiKeysUrl, ...restInitState } = pickFromClerkInitState(
clerkInitState?.__internal_clerk_state,
);
const { clerkSsrState, ...restInitState } = pickFromClerkInitState(clerkInitState?.__internal_clerk_state);

const mergedProps = {
...mergeWithPublicEnvs(restInitState),
...providerProps,
};

// Add keyless mode props if present
const keylessProps = __keylessClaimUrl
? {
__internal_keyless_claimKeylessApplicationUrl: __keylessClaimUrl,
__internal_keyless_copyInstanceKeysUrl: __keylessApiKeysUrl,
}
: {};

return (
<>
<ScriptOnce>{`window.__clerk_init_state = ${htmlSafeJson(clerkInitialState)};`}</ScriptOnce>
Expand All @@ -74,7 +64,6 @@ export function ClerkProvider<TUi extends Ui = Ui>({
});
}}
{...mergedProps}
{...keylessProps}
>
{children}
</ReactClerkProvider>
Expand Down
6 changes: 0 additions & 6 deletions packages/tanstack-react-start/src/client/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ export const pickFromClerkInitState = (
): TanStackProviderAndInitialProps &
InternalClerkScriptProps & {
clerkSsrState: any;
__keylessClaimUrl?: string;
__keylessApiKeysUrl?: string;
} => {
const {
__clerk_ssr_state,
Expand All @@ -32,8 +30,6 @@ export const pickFromClerkInitState = (
__signUpForceRedirectUrl,
__signInFallbackRedirectUrl,
__signUpFallbackRedirectUrl,
__keylessClaimUrl,
__keylessApiKeysUrl,
__prefetchUI,
} = clerkInitState || {};

Expand All @@ -59,8 +55,6 @@ export const pickFromClerkInitState = (
signUpForceRedirectUrl: __signUpForceRedirectUrl,
signInFallbackRedirectUrl: __signInFallbackRedirectUrl,
signUpFallbackRedirectUrl: __signUpFallbackRedirectUrl,
__keylessClaimUrl,
__keylessApiKeysUrl,
};
};

Expand Down
30 changes: 7 additions & 23 deletions packages/tanstack-react-start/src/server/clerkMiddleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { createMiddleware } from '@tanstack/react-start';

import { canUseKeyless } from '../utils/feature-flags';
import { clerkClient } from './clerkClient';
import { resolveKeysWithKeylessFallback } from './keyless/utils';
import { completeOnboardingIfClaimed } from './keyless/utils';
import { loadOptions } from './loadOptions';
import type { ClerkMiddlewareOptions, ClerkMiddlewareOptionsCallback } from './types';
import { getResponseClerkState } from './utils';
Expand All @@ -29,19 +29,12 @@ export const clerkMiddleware = (
secretKey: resolvedOptions?.secretKey,
});

// Get keys - either from options, env, or keyless mode
const {
publishableKey,
secretKey,
claimUrl: keylessClaimUrl,
apiKeysUrl: keylessApiKeysUrl,
} = await resolveKeysWithKeylessFallback(loadedOptions.publishableKey, loadedOptions.secretKey);

if (publishableKey) {
loadedOptions.publishableKey = publishableKey;
}
if (secretKey) {
loadedOptions.secretKey = secretKey;
if (canUseKeyless) {
try {
await completeOnboardingIfClaimed(loadedOptions.publishableKey);
} catch {
// Silently fail - claimed-keys onboarding must not break requests
}
}

const requestState = await clerkClient().authenticateRequest(clerkRequest, {
Expand All @@ -67,15 +60,6 @@ export const clerkMiddleware = (

const clerkInitialState = getResponseClerkState(requestState as RequestState, loadedOptions);

// Include keyless mode URLs if applicable
if (canUseKeyless && keylessClaimUrl) {
(clerkInitialState as Record<string, unknown>).__internal_clerk_state = {
...((clerkInitialState as Record<string, unknown>).__internal_clerk_state as Record<string, unknown>),
__keylessClaimUrl: keylessClaimUrl,
__keylessApiKeysUrl: keylessApiKeysUrl,
};
}

const result = await next({
context: {
clerkInitialState,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';

import { completeOnboardingIfClaimed } from '../utils';

const { completeClaimedOnboarding, log, readKeys, completeOnboarding } = vi.hoisted(() => ({
completeClaimedOnboarding: vi.fn(() => Promise.resolve()),
log: vi.fn(),
readKeys: vi.fn(),
completeOnboarding: vi.fn(),
}));

vi.mock('@clerk/shared/keyless', () => ({
completeClaimedOnboarding,
clerkDevelopmentCache: { log },
}));

vi.mock('../index', () => ({
keyless: () => ({ readKeys, completeOnboarding }),
}));

const storedKeys = {
publishableKey: 'pk_test_stored',
secretKey: 'sk_test_stored',
claimUrl: 'https://dashboard.clerk.com/apps/claim',
apiKeysUrl: 'https://dashboard.clerk.com/last-active?path=api-keys',
};

describe('completeOnboardingIfClaimed', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('completes onboarding when the configured key matches the stored keyless keys', async () => {
readKeys.mockReturnValue(storedKeys);

await completeOnboardingIfClaimed('pk_test_stored');

expect(completeClaimedOnboarding).toHaveBeenCalledTimes(1);
expect(completeClaimedOnboarding).toHaveBeenCalledWith('pk_test_stored', expect.objectContaining({ readKeys }));
});

it('does nothing when the configured key does not match the stored keys', async () => {
readKeys.mockReturnValue(storedKeys);

await completeOnboardingIfClaimed('pk_test_other');

expect(completeClaimedOnboarding).not.toHaveBeenCalled();
expect(log).not.toHaveBeenCalled();
});

it('does nothing when no keyless keys are stored', async () => {
readKeys.mockReturnValue(undefined);

await completeOnboardingIfClaimed('pk_test_stored');

expect(completeClaimedOnboarding).not.toHaveBeenCalled();
expect(log).not.toHaveBeenCalled();
});

it('logs a pointer to the stored keys when no key is configured, without completing onboarding', async () => {
readKeys.mockReturnValue(storedKeys);

await completeOnboardingIfClaimed(undefined);

expect(completeClaimedOnboarding).not.toHaveBeenCalled();
expect(log).toHaveBeenCalledTimes(1);
expect(log).toHaveBeenCalledWith(
expect.objectContaining({
cacheKey: 'pk_test_stored_stored',
msg: expect.stringContaining('.clerk/.tmp/keyless.json'),
}),
);
expect(log).toHaveBeenCalledWith(expect.objectContaining({ msg: expect.stringContaining(storedKeys.claimUrl) }));
});
});
10 changes: 0 additions & 10 deletions packages/tanstack-react-start/src/server/keyless/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@ export function keyless() {
keylessServiceInstance = createKeylessService({
storage: createFileStorage(),
api: {
async createAccountlessApplication(requestHeaders?: Headers, source?: string) {
try {
return await clerkClient().__experimental_accountlessApplications.createAccountlessApplication({
requestHeaders,
source,
});
} catch {
return null;
}
},
async completeOnboarding(requestHeaders?: Headers, source?: string) {
try {
return await clerkClient().__experimental_accountlessApplications.completeAccountlessApplicationOnboarding({
Expand Down
37 changes: 24 additions & 13 deletions packages/tanstack-react-start/src/server/keyless/utils.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
import { resolveKeysWithKeylessFallback as sharedResolveKeysWithKeylessFallback } from '@clerk/shared/keyless';
export type { KeylessResult } from '@clerk/shared/keyless';
import { clerkDevelopmentCache, completeClaimedOnboarding } from '@clerk/shared/keyless';

import { canUseKeyless } from '../../utils/feature-flags';
import { keyless } from './index';

/**
* Resolves Clerk keys, falling back to keyless mode in development if configured keys are missing.
*
* @param configuredPublishableKey - The publishable key from options or environment
* @param configuredSecretKey - The secret key from options or environment
* @returns The resolved keys (either configured or from keyless mode)
* Notifies the dashboard that a claimed keyless application is now running with its
* keys configured. When no key is configured but stored keyless keys exist, logs a
* one-time pointer to them instead (the missing-key error throws downstream).
*/
export function resolveKeysWithKeylessFallback(
configuredPublishableKey: string | undefined,
configuredSecretKey: string | undefined,
) {
return sharedResolveKeysWithKeylessFallback(configuredPublishableKey, configuredSecretKey, keyless(), canUseKeyless);
export async function completeOnboardingIfClaimed(configuredPublishableKey: string | undefined): Promise<void> {
const keylessService = keyless();
const locallyStoredKeys = keylessService.readKeys();
if (!locallyStoredKeys) {
return;
}

if (!configuredPublishableKey) {
clerkDevelopmentCache?.log({
cacheKey: `${locallyStoredKeys.publishableKey}_stored`,
msg: `[Clerk]: Found existing keyless-mode keys in .clerk/.tmp/keyless.json. Copy the publishableKey and secretKey into .env (CLERK_PUBLISHABLE_KEY / CLERK_SECRET_KEY) to keep using that application, or claim it at ${locallyStoredKeys.claimUrl}`,
});
return;
}

if (locallyStoredKeys.publishableKey !== configuredPublishableKey) {
return;
}

await completeClaimedOnboarding(locallyStoredKeys.publishableKey, keylessService);
}
2 changes: 1 addition & 1 deletion packages/tanstack-react-start/src/server/loadOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const loadOptions = (request: ClerkRequest, overrides: LoaderOptions = {}
proxyUrl = relativeOrAbsoluteProxyUrl;
}

// In keyless mode, don't throw if secretKey is missing - ClerkProvider will handle it
// In development, defer missing-key errors to authenticateRequest so the CLI-pointing message surfaces
if (!secretKey && !canUseKeyless) {
// eslint-disable-next-line @typescript-eslint/only-throw-error
throw errorThrower.throw('Clerk: no secret key provided');
Expand Down
Loading