fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Railly merged 4 commits into from
Jun 17, 2026
Merged

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31baaf9
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
Railly Jun 12, 2026
5eac92d
chore: add changeset
Railly Jun 12, 2026
1df3c49
refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…
Railly Jun 16, 2026
5e62655
refactor(deploy): extract clerkSubdomains helper per wyattjoh review
Railly Jun 17, 2026
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/fix-oauth-redirect-fapi.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.
12 changes: 8 additions & 4 deletions packages/cli-core/src/commands/deploy/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.
15 changes: 14 additions & 1 deletion packages/cli-core/src/commands/deploy/copy.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
];
}

export function clerkSubdomains(domain: string): {
frontendApi: string;
accountPortal: string;
mail: string;
} {
return {
frontendApi: `clerk.${domain}`,
accountPortal: `accounts.${domain}`,
mail: `clkmail.${domain}`,
};
}

export function domainAssociationSummary(domain: string): string[] {
const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
const hosts = [frontendApi, accountPortal, mail];
return [
`Clerk will associate these subdomains with ${cyan(domain)}:`,
"",
Expand Down
125 changes: 83 additions & 42 deletions packages/cli-core/src/commands/deploy/index.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
mockGetApplicationDomainStatus.mockResolvedValue(
domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
);
mockCreateProductionInstance.mockImplementation(
(_appId: string, params: { domain: string }) => {
const hostname = params.domain;
return {
object: "instance",
id: "ins_prod_mock",
environment_type: "production" as const,
active_domain: {
object: "domain",
id: "dmn_prod_mock",
name: hostname,
is_satellite: false,
is_provider_domain: false,
frontend_api_url: `https://clerk.${hostname}`,
development_origin: "",
cname_targets: [
{
host: `clerk.${hostname}`,
value: "frontend-api.clerk.services",
required: true,
},
{
host: `accounts.${hostname}`,
value: "accounts.clerk.services",
required: true,
},
{
host: `clkmail.${hostname}`,
value: `mail.${hostname}.nam1.clerk.services`,
required: true,
},
],
created_at: "2026-05-06T00:00:00Z",
updated_at: "2026-05-06T00:00:00Z",
},
publishable_key: "pk_live_test",
secret_key: "sk_live_test",
created_at: 1770000000000,
updated_at: 1770000000000,
};
},
);
stubCreateProductionInstance();
mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
);
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
return deploy(options);
}

function stubCreateProductionInstance(
overrides: {
frontendApiUrl?: string;
cnameTargets?: { host: string; value: string; required: boolean }[];
} = {},
) {
mockCreateProductionInstance.mockImplementation(
(_appId: string, params: { domain: string }) => {
const hostname = params.domain;
return {
object: "instance",
id: "ins_prod_mock",
environment_type: "production" as const,
active_domain: {
object: "domain",
id: "dmn_prod_mock",
name: hostname,
is_satellite: false,
is_provider_domain: false,
frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
development_origin: "",
cname_targets: overrides.cnameTargets ?? [
{
host: `clerk.${hostname}`,
value: "frontend-api.clerk.services",
required: true,
},
{
host: `accounts.${hostname}`,
value: "accounts.clerk.services",
required: true,
},
{
host: `clkmail.${hostname}`,
value: `mail.${hostname}.nam1.clerk.services`,
required: true,
},
],
created_at: "2026-05-06T00:00:00Z",
updated_at: "2026-05-06T00:00:00Z",
},
publishable_key: "pk_live_test",
secret_key: "sk_live_test",
created_at: 1770000000000,
updated_at: 1770000000000,
};
},
);
}

async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
try {
await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
client_secret: "github-secret",
},
});
const err = stripAnsi(captured.err);
expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
});

test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
await linkedProject();
mockIsAgent.mockReturnValue(false);
// Distinctive URL proves the value is threaded from the API response
// rather than string-built from the domain name.
stubCreateProductionInstance({
frontendApiUrl: "https://clerk-fapi.example.com",
cnameTargets: [],
});
mockConfirm
.mockResolvedValueOnce(true) // Proceed?
.mockResolvedValueOnce(true); // Create production instance?
mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
mockSelect
.mockResolvedValueOnce("walkthrough") // Google OAuth credentials
.mockResolvedValueOnce("have-credentials")
.mockResolvedValueOnce("skip"); // DNS verification
mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
mockPassword.mockResolvedValueOnce("fake-secret");

await runDeploy({});
const err = stripAnsi(captured.err);

// The callback is a Frontend API endpoint; the walkthrough must print the
// API-reported frontend_api_url, never the Account Portal subdomain.
expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
});

test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down
5 changes: 4 additions & 1 deletion packages/cli-core/src/commands/deploy/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
productionInstanceId: production.id,
productionDomainId: production.active_domain.id,
domain: productionDomain,
frontendApiUrl: production.active_domain.frontend_api_url,
pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
descriptor,
state.domain,
productionInstanceId,
state.frontendApiUrl,
);
if (!saved) {
throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
descriptor: OAuthProviderDescriptor,
domain: string,
productionInstanceId: string,
frontendApiUrl?: string,
): Promise<boolean> {
for (const line of providerSetupIntro(descriptor)) log.info(line);
log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
}

if (choice === "walkthrough") {
await showOAuthWalkthrough(descriptor, domain);
await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
if (choice === "skip") {
return false;
Expand Down
22 changes: 19 additions & 3 deletions packages/cli-core/src/commands/deploy/providers.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
domain: string,
frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
const callbackBase =
frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
return {
authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
redirectUri: `${callbackBase}/v1/oauth_callback`,
};
}

/**
* Show OAuth provider walkthrough values and open provider docs.
*/
export async function showOAuthWalkthrough(
provider: OAuthProvider | OAuthProviderDescriptor,
domain: string,
frontendApiUrl?: string,
): Promise<void> {
const descriptor = providerDescriptorFromInput(provider);
const slug = descriptor?.provider ?? (provider as OAuthProvider);
const label = descriptor?.label ?? providerLabel(slug);
const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
log.info(` ${dim("Authorized JavaScript origins")}`);
log.info(` ${cyan(`https://${domain}`)}`);
log.info(` ${cyan(`https://www.${domain}`)}`);
for (const origin of authorizedOrigins) {
log.info(` ${cyan(origin)}`);
}
log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
log.info(` ${cyan(redirectUri)}`);
const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
if (gotcha) {
log.blank();
Expand Down
1 change: 1 addition & 0 deletions packages/cli-core/src/commands/deploy/state.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
productionInstanceId?: string;
productionDomainId?: string;
domain: string;
frontendApiUrl?: string;
pending: { type: "dns" } | { type: "oauth"; provider: string };
oauthProviders: string[];
completedOAuthProviders: string[];
Expand Down
1 change: 1 addition & 0 deletions packages/cli-core/src/commands/deploy/status.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
productionInstanceId,
productionDomainId: domain.id,
domain: domain.name,
frontendApiUrl: domain.frontend_api_url,
oauthProviders,
oauthProviderDescriptors,
completedOAuthProviders,
Expand Down
, '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
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Railly
merged 4 commits into

from

Jun 17, 2026
 Merged


fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
#335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
31baaf9

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough


Railly Jun 12, 2026
5eac92d

chore: add changeset


Railly Jun 12, 2026
1df3c49

refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…


Railly Jun 16, 2026
5e62655

refactor(deploy): extract clerkSubdomains helper per wyattjoh review


Railly Jun 17, 2026

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/fix-oauth-redirect-fapi.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.

12 changes: 8 additions & 4 deletions
packages/cli-core/src/commands/deploy/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.

15 changes: 14 additions & 1 deletion
packages/cli-core/src/commands/deploy/copy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
 ];
}

export function clerkSubdomains(domain: string): {
 frontendApi: string;
 accountPortal: string;
 mail: string;
} {
 return {
 frontendApi: `clerk.${domain}`,
 accountPortal: `accounts.${domain}`,
 mail: `clkmail.${domain}`,
 };
}

export function domainAssociationSummary(domain: string): string[] {
 const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
 const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
 const hosts = [frontendApi, accountPortal, mail];
 return [
 `Clerk will associate these subdomains with ${cyan(domain)}:`,
 "",
Expand Down

125 changes: 83 additions & 42 deletions
packages/cli-core/src/commands/deploy/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
 mockGetApplicationDomainStatus.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 stubCreateProductionInstance();
 mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
 return deploy(options);
 }

 function stubCreateProductionInstance(
 overrides: {
 frontendApiUrl?: string;
 cnameTargets?: { host: string; value: string; required: boolean }[];
 } = {},
 ) {
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: overrides.cnameTargets ?? [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 }

 async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
 try {
 await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
 client_secret: "github-secret",
 },
 });
 const err = stripAnsi(captured.err);
 expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
 await linkedProject();
 mockIsAgent.mockReturnValue(false);
 // Distinctive URL proves the value is threaded from the API response
 // rather than string-built from the domain name.
 stubCreateProductionInstance({
 frontendApiUrl: "https://clerk-fapi.example.com",
 cnameTargets: [],
 });
 mockConfirm
 .mockResolvedValueOnce(true) // Proceed?
 .mockResolvedValueOnce(true); // Create production instance?
 mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
 mockSelect
 .mockResolvedValueOnce("walkthrough") // Google OAuth credentials
 .mockResolvedValueOnce("have-credentials")
 .mockResolvedValueOnce("skip"); // DNS verification
 mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
 mockPassword.mockResolvedValueOnce("fake-secret");

 await runDeploy({});
 const err = stripAnsi(captured.err);

 // The callback is a Frontend API endpoint; the walkthrough must print the
 // API-reported frontend_api_url, never the Account Portal subdomain.
 expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down

5 changes: 4 additions & 1 deletion
packages/cli-core/src/commands/deploy/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
 productionInstanceId: production.id,
 productionDomainId: production.active_domain.id,
 domain: productionDomain,
 frontendApiUrl: production.active_domain.frontend_api_url,
 pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
 oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
 completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
 descriptor,
 state.domain,
 productionInstanceId,
 state.frontendApiUrl,
 );
 if (!saved) {
 throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
 descriptor: OAuthProviderDescriptor,
 domain: string,
 productionInstanceId: string,
 frontendApiUrl?: string,
): Promise<boolean> {
 for (const line of providerSetupIntro(descriptor)) log.info(line);
 log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
 }

 if (choice === "walkthrough") {
 await showOAuthWalkthrough(descriptor, domain);
 await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
 choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
 if (choice === "skip") {
 return false;
Expand Down

22 changes: 19 additions & 3 deletions
packages/cli-core/src/commands/deploy/providers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
 return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
 domain: string,
 frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
 const callbackBase =
 frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
 return {
 authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
 redirectUri: `${callbackBase}/v1/oauth_callback`,
 };
}

/**
 * Show OAuth provider walkthrough values and open provider docs.
 */
export async function showOAuthWalkthrough(
 provider: OAuthProvider | OAuthProviderDescriptor,
 domain: string,
 frontendApiUrl?: string,
): Promise<void> {
 const descriptor = providerDescriptorFromInput(provider);
 const slug = descriptor?.provider ?? (provider as OAuthProvider);
 const label = descriptor?.label ?? providerLabel(slug);
 const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
 const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

 log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
 log.info(` ${dim("Authorized JavaScript origins")}`);
 log.info(` ${cyan(`https://${domain}`)}`);
 log.info(` ${cyan(`https://www.${domain}`)}`);
 for (const origin of authorizedOrigins) {
 log.info(` ${cyan(origin)}`);
 }
 log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
 log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
 log.info(` ${cyan(redirectUri)}`);
 const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
 if (gotcha) {
 log.blank();
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/state.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
 productionInstanceId?: string;
 productionDomainId?: string;
 domain: string;
 frontendApiUrl?: string;
 pending: { type: "dns" } | { type: "oauth"; provider: string };
 oauthProviders: string[];
 completedOAuthProviders: string[];
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/status.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
 productionInstanceId,
 productionDomainId: domain.id,
 domain: domain.name,
 frontendApiUrl: domain.frontend_api_url,
 oauthProviders,
 oauthProviderDescriptors,
 completedOAuthProviders,
Expand Down

, '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
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Railly
merged 4 commits into

from

Jun 17, 2026
 Merged


fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
#335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
31baaf9

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough


Railly Jun 12, 2026
5eac92d

chore: add changeset


Railly Jun 12, 2026
1df3c49

refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…


Railly Jun 16, 2026
5e62655

refactor(deploy): extract clerkSubdomains helper per wyattjoh review


Railly Jun 17, 2026

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/fix-oauth-redirect-fapi.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.

12 changes: 8 additions & 4 deletions
packages/cli-core/src/commands/deploy/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.

15 changes: 14 additions & 1 deletion
packages/cli-core/src/commands/deploy/copy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
 ];
}

export function clerkSubdomains(domain: string): {
 frontendApi: string;
 accountPortal: string;
 mail: string;
} {
 return {
 frontendApi: `clerk.${domain}`,
 accountPortal: `accounts.${domain}`,
 mail: `clkmail.${domain}`,
 };
}

export function domainAssociationSummary(domain: string): string[] {
 const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
 const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
 const hosts = [frontendApi, accountPortal, mail];
 return [
 `Clerk will associate these subdomains with ${cyan(domain)}:`,
 "",
Expand Down

125 changes: 83 additions & 42 deletions
packages/cli-core/src/commands/deploy/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
 mockGetApplicationDomainStatus.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 stubCreateProductionInstance();
 mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
 return deploy(options);
 }

 function stubCreateProductionInstance(
 overrides: {
 frontendApiUrl?: string;
 cnameTargets?: { host: string; value: string; required: boolean }[];
 } = {},
 ) {
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: overrides.cnameTargets ?? [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 }

 async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
 try {
 await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
 client_secret: "github-secret",
 },
 });
 const err = stripAnsi(captured.err);
 expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
 await linkedProject();
 mockIsAgent.mockReturnValue(false);
 // Distinctive URL proves the value is threaded from the API response
 // rather than string-built from the domain name.
 stubCreateProductionInstance({
 frontendApiUrl: "https://clerk-fapi.example.com",
 cnameTargets: [],
 });
 mockConfirm
 .mockResolvedValueOnce(true) // Proceed?
 .mockResolvedValueOnce(true); // Create production instance?
 mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
 mockSelect
 .mockResolvedValueOnce("walkthrough") // Google OAuth credentials
 .mockResolvedValueOnce("have-credentials")
 .mockResolvedValueOnce("skip"); // DNS verification
 mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
 mockPassword.mockResolvedValueOnce("fake-secret");

 await runDeploy({});
 const err = stripAnsi(captured.err);

 // The callback is a Frontend API endpoint; the walkthrough must print the
 // API-reported frontend_api_url, never the Account Portal subdomain.
 expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down

5 changes: 4 additions & 1 deletion
packages/cli-core/src/commands/deploy/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
 productionInstanceId: production.id,
 productionDomainId: production.active_domain.id,
 domain: productionDomain,
 frontendApiUrl: production.active_domain.frontend_api_url,
 pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
 oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
 completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
 descriptor,
 state.domain,
 productionInstanceId,
 state.frontendApiUrl,
 );
 if (!saved) {
 throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
 descriptor: OAuthProviderDescriptor,
 domain: string,
 productionInstanceId: string,
 frontendApiUrl?: string,
): Promise<boolean> {
 for (const line of providerSetupIntro(descriptor)) log.info(line);
 log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
 }

 if (choice === "walkthrough") {
 await showOAuthWalkthrough(descriptor, domain);
 await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
 choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
 if (choice === "skip") {
 return false;
Expand Down

22 changes: 19 additions & 3 deletions
packages/cli-core/src/commands/deploy/providers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
 return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
 domain: string,
 frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
 const callbackBase =
 frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
 return {
 authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
 redirectUri: `${callbackBase}/v1/oauth_callback`,
 };
}

/**
 * Show OAuth provider walkthrough values and open provider docs.
 */
export async function showOAuthWalkthrough(
 provider: OAuthProvider | OAuthProviderDescriptor,
 domain: string,
 frontendApiUrl?: string,
): Promise<void> {
 const descriptor = providerDescriptorFromInput(provider);
 const slug = descriptor?.provider ?? (provider as OAuthProvider);
 const label = descriptor?.label ?? providerLabel(slug);
 const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
 const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

 log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
 log.info(` ${dim("Authorized JavaScript origins")}`);
 log.info(` ${cyan(`https://${domain}`)}`);
 log.info(` ${cyan(`https://www.${domain}`)}`);
 for (const origin of authorizedOrigins) {
 log.info(` ${cyan(origin)}`);
 }
 log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
 log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
 log.info(` ${cyan(redirectUri)}`);
 const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
 if (gotcha) {
 log.blank();
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/state.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
 productionInstanceId?: string;
 productionDomainId?: string;
 domain: string;
 frontendApiUrl?: string;
 pending: { type: "dns" } | { type: "oauth"; provider: string };
 oauthProviders: string[];
 completedOAuthProviders: string[];
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/status.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
 productionInstanceId,
 productionDomainId: domain.id,
 domain: domain.name,
 frontendApiUrl: domain.frontend_api_url,
 oauthProviders,
 oauthProviderDescriptors,
 completedOAuthProviders,
Expand Down

, '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
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Railly
merged 4 commits into

from

Jun 17, 2026
 Merged


fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
#335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
31baaf9

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough


Railly Jun 12, 2026
5eac92d

chore: add changeset


Railly Jun 12, 2026
1df3c49

refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…


Railly Jun 16, 2026
5e62655

refactor(deploy): extract clerkSubdomains helper per wyattjoh review


Railly Jun 17, 2026

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/fix-oauth-redirect-fapi.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.

12 changes: 8 additions & 4 deletions
packages/cli-core/src/commands/deploy/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.

15 changes: 14 additions & 1 deletion
packages/cli-core/src/commands/deploy/copy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
 ];
}

export function clerkSubdomains(domain: string): {
 frontendApi: string;
 accountPortal: string;
 mail: string;
} {
 return {
 frontendApi: `clerk.${domain}`,
 accountPortal: `accounts.${domain}`,
 mail: `clkmail.${domain}`,
 };
}

export function domainAssociationSummary(domain: string): string[] {
 const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
 const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
 const hosts = [frontendApi, accountPortal, mail];
 return [
 `Clerk will associate these subdomains with ${cyan(domain)}:`,
 "",
Expand Down

125 changes: 83 additions & 42 deletions
packages/cli-core/src/commands/deploy/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
 mockGetApplicationDomainStatus.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 stubCreateProductionInstance();
 mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
 return deploy(options);
 }

 function stubCreateProductionInstance(
 overrides: {
 frontendApiUrl?: string;
 cnameTargets?: { host: string; value: string; required: boolean }[];
 } = {},
 ) {
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: overrides.cnameTargets ?? [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 }

 async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
 try {
 await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
 client_secret: "github-secret",
 },
 });
 const err = stripAnsi(captured.err);
 expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
 await linkedProject();
 mockIsAgent.mockReturnValue(false);
 // Distinctive URL proves the value is threaded from the API response
 // rather than string-built from the domain name.
 stubCreateProductionInstance({
 frontendApiUrl: "https://clerk-fapi.example.com",
 cnameTargets: [],
 });
 mockConfirm
 .mockResolvedValueOnce(true) // Proceed?
 .mockResolvedValueOnce(true); // Create production instance?
 mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
 mockSelect
 .mockResolvedValueOnce("walkthrough") // Google OAuth credentials
 .mockResolvedValueOnce("have-credentials")
 .mockResolvedValueOnce("skip"); // DNS verification
 mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
 mockPassword.mockResolvedValueOnce("fake-secret");

 await runDeploy({});
 const err = stripAnsi(captured.err);

 // The callback is a Frontend API endpoint; the walkthrough must print the
 // API-reported frontend_api_url, never the Account Portal subdomain.
 expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down

5 changes: 4 additions & 1 deletion
packages/cli-core/src/commands/deploy/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
 productionInstanceId: production.id,
 productionDomainId: production.active_domain.id,
 domain: productionDomain,
 frontendApiUrl: production.active_domain.frontend_api_url,
 pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
 oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
 completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
 descriptor,
 state.domain,
 productionInstanceId,
 state.frontendApiUrl,
 );
 if (!saved) {
 throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
 descriptor: OAuthProviderDescriptor,
 domain: string,
 productionInstanceId: string,
 frontendApiUrl?: string,
): Promise<boolean> {
 for (const line of providerSetupIntro(descriptor)) log.info(line);
 log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
 }

 if (choice === "walkthrough") {
 await showOAuthWalkthrough(descriptor, domain);
 await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
 choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
 if (choice === "skip") {
 return false;
Expand Down

22 changes: 19 additions & 3 deletions
packages/cli-core/src/commands/deploy/providers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
 return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
 domain: string,
 frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
 const callbackBase =
 frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
 return {
 authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
 redirectUri: `${callbackBase}/v1/oauth_callback`,
 };
}

/**
 * Show OAuth provider walkthrough values and open provider docs.
 */
export async function showOAuthWalkthrough(
 provider: OAuthProvider | OAuthProviderDescriptor,
 domain: string,
 frontendApiUrl?: string,
): Promise<void> {
 const descriptor = providerDescriptorFromInput(provider);
 const slug = descriptor?.provider ?? (provider as OAuthProvider);
 const label = descriptor?.label ?? providerLabel(slug);
 const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
 const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

 log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
 log.info(` ${dim("Authorized JavaScript origins")}`);
 log.info(` ${cyan(`https://${domain}`)}`);
 log.info(` ${cyan(`https://www.${domain}`)}`);
 for (const origin of authorizedOrigins) {
 log.info(` ${cyan(origin)}`);
 }
 log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
 log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
 log.info(` ${cyan(redirectUri)}`);
 const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
 if (gotcha) {
 log.blank();
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/state.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
 productionInstanceId?: string;
 productionDomainId?: string;
 domain: string;
 frontendApiUrl?: string;
 pending: { type: "dns" } | { type: "oauth"; provider: string };
 oauthProviders: string[];
 completedOAuthProviders: string[];
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/status.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
 productionInstanceId,
 productionDomainId: domain.id,
 domain: domain.name,
 frontendApiUrl: domain.frontend_api_url,
 oauthProviders,
 oauthProviderDescriptors,
 completedOAuthProviders,
Expand Down

, '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
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Railly
merged 4 commits into

from

Jun 17, 2026
 Merged


fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
#335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
31baaf9

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough


Railly Jun 12, 2026
5eac92d

chore: add changeset


Railly Jun 12, 2026
1df3c49

refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…


Railly Jun 16, 2026
5e62655

refactor(deploy): extract clerkSubdomains helper per wyattjoh review


Railly Jun 17, 2026

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/fix-oauth-redirect-fapi.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.

12 changes: 8 additions & 4 deletions
packages/cli-core/src/commands/deploy/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.

15 changes: 14 additions & 1 deletion
packages/cli-core/src/commands/deploy/copy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
 ];
}

export function clerkSubdomains(domain: string): {
 frontendApi: string;
 accountPortal: string;
 mail: string;
} {
 return {
 frontendApi: `clerk.${domain}`,
 accountPortal: `accounts.${domain}`,
 mail: `clkmail.${domain}`,
 };
}

export function domainAssociationSummary(domain: string): string[] {
 const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
 const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
 const hosts = [frontendApi, accountPortal, mail];
 return [
 `Clerk will associate these subdomains with ${cyan(domain)}:`,
 "",
Expand Down

125 changes: 83 additions & 42 deletions
packages/cli-core/src/commands/deploy/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
 mockGetApplicationDomainStatus.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 stubCreateProductionInstance();
 mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
 return deploy(options);
 }

 function stubCreateProductionInstance(
 overrides: {
 frontendApiUrl?: string;
 cnameTargets?: { host: string; value: string; required: boolean }[];
 } = {},
 ) {
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: overrides.cnameTargets ?? [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 }

 async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
 try {
 await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
 client_secret: "github-secret",
 },
 });
 const err = stripAnsi(captured.err);
 expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
 await linkedProject();
 mockIsAgent.mockReturnValue(false);
 // Distinctive URL proves the value is threaded from the API response
 // rather than string-built from the domain name.
 stubCreateProductionInstance({
 frontendApiUrl: "https://clerk-fapi.example.com",
 cnameTargets: [],
 });
 mockConfirm
 .mockResolvedValueOnce(true) // Proceed?
 .mockResolvedValueOnce(true); // Create production instance?
 mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
 mockSelect
 .mockResolvedValueOnce("walkthrough") // Google OAuth credentials
 .mockResolvedValueOnce("have-credentials")
 .mockResolvedValueOnce("skip"); // DNS verification
 mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
 mockPassword.mockResolvedValueOnce("fake-secret");

 await runDeploy({});
 const err = stripAnsi(captured.err);

 // The callback is a Frontend API endpoint; the walkthrough must print the
 // API-reported frontend_api_url, never the Account Portal subdomain.
 expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down

5 changes: 4 additions & 1 deletion
packages/cli-core/src/commands/deploy/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
 productionInstanceId: production.id,
 productionDomainId: production.active_domain.id,
 domain: productionDomain,
 frontendApiUrl: production.active_domain.frontend_api_url,
 pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
 oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
 completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
 descriptor,
 state.domain,
 productionInstanceId,
 state.frontendApiUrl,
 );
 if (!saved) {
 throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
 descriptor: OAuthProviderDescriptor,
 domain: string,
 productionInstanceId: string,
 frontendApiUrl?: string,
): Promise<boolean> {
 for (const line of providerSetupIntro(descriptor)) log.info(line);
 log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
 }

 if (choice === "walkthrough") {
 await showOAuthWalkthrough(descriptor, domain);
 await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
 choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
 if (choice === "skip") {
 return false;
Expand Down

22 changes: 19 additions & 3 deletions
packages/cli-core/src/commands/deploy/providers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
 return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
 domain: string,
 frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
 const callbackBase =
 frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
 return {
 authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
 redirectUri: `${callbackBase}/v1/oauth_callback`,
 };
}

/**
 * Show OAuth provider walkthrough values and open provider docs.
 */
export async function showOAuthWalkthrough(
 provider: OAuthProvider | OAuthProviderDescriptor,
 domain: string,
 frontendApiUrl?: string,
): Promise<void> {
 const descriptor = providerDescriptorFromInput(provider);
 const slug = descriptor?.provider ?? (provider as OAuthProvider);
 const label = descriptor?.label ?? providerLabel(slug);
 const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
 const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

 log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
 log.info(` ${dim("Authorized JavaScript origins")}`);
 log.info(` ${cyan(`https://${domain}`)}`);
 log.info(` ${cyan(`https://www.${domain}`)}`);
 for (const origin of authorizedOrigins) {
 log.info(` ${cyan(origin)}`);
 }
 log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
 log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
 log.info(` ${cyan(redirectUri)}`);
 const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
 if (gotcha) {
 log.blank();
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/state.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
 productionInstanceId?: string;
 productionDomainId?: string;
 domain: string;
 frontendApiUrl?: string;
 pending: { type: "dns" } | { type: "oauth"; provider: string };
 oauthProviders: string[];
 completedOAuthProviders: string[];
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/status.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
 productionInstanceId,
 productionDomainId: domain.id,
 domain: domain.name,
 frontendApiUrl: domain.frontend_api_url,
 oauthProviders,
 oauthProviderDescriptors,
 completedOAuthProviders,
Expand Down

, '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
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Railly
merged 4 commits into

from

Jun 17, 2026
 Merged


fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
#335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
31baaf9

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough


Railly Jun 12, 2026
5eac92d

chore: add changeset


Railly Jun 12, 2026
1df3c49

refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…


Railly Jun 16, 2026
5e62655

refactor(deploy): extract clerkSubdomains helper per wyattjoh review


Railly Jun 17, 2026

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/fix-oauth-redirect-fapi.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.

12 changes: 8 additions & 4 deletions
packages/cli-core/src/commands/deploy/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.

15 changes: 14 additions & 1 deletion
packages/cli-core/src/commands/deploy/copy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
 ];
}

export function clerkSubdomains(domain: string): {
 frontendApi: string;
 accountPortal: string;
 mail: string;
} {
 return {
 frontendApi: `clerk.${domain}`,
 accountPortal: `accounts.${domain}`,
 mail: `clkmail.${domain}`,
 };
}

export function domainAssociationSummary(domain: string): string[] {
 const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
 const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
 const hosts = [frontendApi, accountPortal, mail];
 return [
 `Clerk will associate these subdomains with ${cyan(domain)}:`,
 "",
Expand Down

125 changes: 83 additions & 42 deletions
packages/cli-core/src/commands/deploy/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
 mockGetApplicationDomainStatus.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 stubCreateProductionInstance();
 mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
 return deploy(options);
 }

 function stubCreateProductionInstance(
 overrides: {
 frontendApiUrl?: string;
 cnameTargets?: { host: string; value: string; required: boolean }[];
 } = {},
 ) {
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: overrides.cnameTargets ?? [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 }

 async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
 try {
 await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
 client_secret: "github-secret",
 },
 });
 const err = stripAnsi(captured.err);
 expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
 await linkedProject();
 mockIsAgent.mockReturnValue(false);
 // Distinctive URL proves the value is threaded from the API response
 // rather than string-built from the domain name.
 stubCreateProductionInstance({
 frontendApiUrl: "https://clerk-fapi.example.com",
 cnameTargets: [],
 });
 mockConfirm
 .mockResolvedValueOnce(true) // Proceed?
 .mockResolvedValueOnce(true); // Create production instance?
 mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
 mockSelect
 .mockResolvedValueOnce("walkthrough") // Google OAuth credentials
 .mockResolvedValueOnce("have-credentials")
 .mockResolvedValueOnce("skip"); // DNS verification
 mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
 mockPassword.mockResolvedValueOnce("fake-secret");

 await runDeploy({});
 const err = stripAnsi(captured.err);

 // The callback is a Frontend API endpoint; the walkthrough must print the
 // API-reported frontend_api_url, never the Account Portal subdomain.
 expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down

5 changes: 4 additions & 1 deletion
packages/cli-core/src/commands/deploy/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
 productionInstanceId: production.id,
 productionDomainId: production.active_domain.id,
 domain: productionDomain,
 frontendApiUrl: production.active_domain.frontend_api_url,
 pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
 oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
 completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
 descriptor,
 state.domain,
 productionInstanceId,
 state.frontendApiUrl,
 );
 if (!saved) {
 throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
 descriptor: OAuthProviderDescriptor,
 domain: string,
 productionInstanceId: string,
 frontendApiUrl?: string,
): Promise<boolean> {
 for (const line of providerSetupIntro(descriptor)) log.info(line);
 log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
 }

 if (choice === "walkthrough") {
 await showOAuthWalkthrough(descriptor, domain);
 await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
 choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
 if (choice === "skip") {
 return false;
Expand Down

22 changes: 19 additions & 3 deletions
packages/cli-core/src/commands/deploy/providers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
 return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
 domain: string,
 frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
 const callbackBase =
 frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
 return {
 authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
 redirectUri: `${callbackBase}/v1/oauth_callback`,
 };
}

/**
 * Show OAuth provider walkthrough values and open provider docs.
 */
export async function showOAuthWalkthrough(
 provider: OAuthProvider | OAuthProviderDescriptor,
 domain: string,
 frontendApiUrl?: string,
): Promise<void> {
 const descriptor = providerDescriptorFromInput(provider);
 const slug = descriptor?.provider ?? (provider as OAuthProvider);
 const label = descriptor?.label ?? providerLabel(slug);
 const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
 const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

 log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
 log.info(` ${dim("Authorized JavaScript origins")}`);
 log.info(` ${cyan(`https://${domain}`)}`);
 log.info(` ${cyan(`https://www.${domain}`)}`);
 for (const origin of authorizedOrigins) {
 log.info(` ${cyan(origin)}`);
 }
 log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
 log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
 log.info(` ${cyan(redirectUri)}`);
 const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
 if (gotcha) {
 log.blank();
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/state.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
 productionInstanceId?: string;
 productionDomainId?: string;
 domain: string;
 frontendApiUrl?: string;
 pending: { type: "dns" } | { type: "oauth"; provider: string };
 oauthProviders: string[];
 completedOAuthProviders: string[];
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/status.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
 productionInstanceId,
 productionDomainId: domain.id,
 domain: domain.name,
 frontendApiUrl: domain.frontend_api_url,
 oauthProviders,
 oauthProviderDescriptors,
 completedOAuthProviders,
Expand Down

, '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
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Railly
merged 4 commits into

from

Jun 17, 2026
 Merged


fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
#335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
31baaf9

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough


Railly Jun 12, 2026
5eac92d

chore: add changeset


Railly Jun 12, 2026
1df3c49

refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…


Railly Jun 16, 2026
5e62655

refactor(deploy): extract clerkSubdomains helper per wyattjoh review


Railly Jun 17, 2026

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/fix-oauth-redirect-fapi.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.

12 changes: 8 additions & 4 deletions
packages/cli-core/src/commands/deploy/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.

15 changes: 14 additions & 1 deletion
packages/cli-core/src/commands/deploy/copy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
 ];
}

export function clerkSubdomains(domain: string): {
 frontendApi: string;
 accountPortal: string;
 mail: string;
} {
 return {
 frontendApi: `clerk.${domain}`,
 accountPortal: `accounts.${domain}`,
 mail: `clkmail.${domain}`,
 };
}

export function domainAssociationSummary(domain: string): string[] {
 const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
 const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
 const hosts = [frontendApi, accountPortal, mail];
 return [
 `Clerk will associate these subdomains with ${cyan(domain)}:`,
 "",
Expand Down

125 changes: 83 additions & 42 deletions
packages/cli-core/src/commands/deploy/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
 mockGetApplicationDomainStatus.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 stubCreateProductionInstance();
 mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
 return deploy(options);
 }

 function stubCreateProductionInstance(
 overrides: {
 frontendApiUrl?: string;
 cnameTargets?: { host: string; value: string; required: boolean }[];
 } = {},
 ) {
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: overrides.cnameTargets ?? [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 }

 async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
 try {
 await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
 client_secret: "github-secret",
 },
 });
 const err = stripAnsi(captured.err);
 expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
 await linkedProject();
 mockIsAgent.mockReturnValue(false);
 // Distinctive URL proves the value is threaded from the API response
 // rather than string-built from the domain name.
 stubCreateProductionInstance({
 frontendApiUrl: "https://clerk-fapi.example.com",
 cnameTargets: [],
 });
 mockConfirm
 .mockResolvedValueOnce(true) // Proceed?
 .mockResolvedValueOnce(true); // Create production instance?
 mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
 mockSelect
 .mockResolvedValueOnce("walkthrough") // Google OAuth credentials
 .mockResolvedValueOnce("have-credentials")
 .mockResolvedValueOnce("skip"); // DNS verification
 mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
 mockPassword.mockResolvedValueOnce("fake-secret");

 await runDeploy({});
 const err = stripAnsi(captured.err);

 // The callback is a Frontend API endpoint; the walkthrough must print the
 // API-reported frontend_api_url, never the Account Portal subdomain.
 expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down

5 changes: 4 additions & 1 deletion
packages/cli-core/src/commands/deploy/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
 productionInstanceId: production.id,
 productionDomainId: production.active_domain.id,
 domain: productionDomain,
 frontendApiUrl: production.active_domain.frontend_api_url,
 pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
 oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
 completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
 descriptor,
 state.domain,
 productionInstanceId,
 state.frontendApiUrl,
 );
 if (!saved) {
 throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
 descriptor: OAuthProviderDescriptor,
 domain: string,
 productionInstanceId: string,
 frontendApiUrl?: string,
): Promise<boolean> {
 for (const line of providerSetupIntro(descriptor)) log.info(line);
 log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
 }

 if (choice === "walkthrough") {
 await showOAuthWalkthrough(descriptor, domain);
 await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
 choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
 if (choice === "skip") {
 return false;
Expand Down

22 changes: 19 additions & 3 deletions
packages/cli-core/src/commands/deploy/providers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
 return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
 domain: string,
 frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
 const callbackBase =
 frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
 return {
 authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
 redirectUri: `${callbackBase}/v1/oauth_callback`,
 };
}

/**
 * Show OAuth provider walkthrough values and open provider docs.
 */
export async function showOAuthWalkthrough(
 provider: OAuthProvider | OAuthProviderDescriptor,
 domain: string,
 frontendApiUrl?: string,
): Promise<void> {
 const descriptor = providerDescriptorFromInput(provider);
 const slug = descriptor?.provider ?? (provider as OAuthProvider);
 const label = descriptor?.label ?? providerLabel(slug);
 const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
 const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

 log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
 log.info(` ${dim("Authorized JavaScript origins")}`);
 log.info(` ${cyan(`https://${domain}`)}`);
 log.info(` ${cyan(`https://www.${domain}`)}`);
 for (const origin of authorizedOrigins) {
 log.info(` ${cyan(origin)}`);
 }
 log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
 log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
 log.info(` ${cyan(redirectUri)}`);
 const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
 if (gotcha) {
 log.blank();
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/state.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
 productionInstanceId?: string;
 productionDomainId?: string;
 domain: string;
 frontendApiUrl?: string;
 pending: { type: "dns" } | { type: "oauth"; provider: string };
 oauthProviders: string[];
 completedOAuthProviders: string[];
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/status.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
 productionInstanceId,
 productionDomainId: domain.id,
 domain: domain.name,
 frontendApiUrl: domain.frontend_api_url,
 oauthProviders,
 oauthProviderDescriptors,
 completedOAuthProviders,
Expand Down

, '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
fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough#335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

Railly
merged 4 commits into

from

Jun 17, 2026
 Merged


fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough
#335
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
31baaf9

fix(deploy): use Frontend API URL for OAuth redirect URI in walkthrough


Railly Jun 12, 2026
5eac92d

chore: add changeset


Railly Jun 12, 2026
1df3c49

refactor(deploy): extract oauthWalkthroughUrls helper per wyattjoh re…


Railly Jun 16, 2026
5e62655

refactor(deploy): extract clerkSubdomains helper per wyattjoh review


Railly Jun 17, 2026

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/fix-oauth-redirect-fapi.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
"clerk": patch
---

Fix the OAuth provider walkthrough in `clerk deploy` printing the redirect URI on the wrong subdomain. Previously, the walkthrough showed `https://accounts.{domain}/v1/oauth_callback`, but the callback is served by the Frontend API, so pasting the value into a provider console caused `redirect_uri_mismatch`. The walkthrough now prints the instance's `frontend_api_url` (e.g. `https://clerk.{domain}/v1/oauth_callback`), matching the value shown in the Clerk Dashboard.

12 changes: 8 additions & 4 deletions
packages/cli-core/src/commands/deploy/README.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -189,7 +189,11 @@ Production instances return `422` if you try to enable a provider without creden

When the user chooses the guided walkthrough, these values are derived from their domain:

| Field | Value |
| ----------------------------- | --------------------------------------------- |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `https://accounts.{domain}/v1/oauth_callback` |
| Field | Value |
| ----------------------------- | ------------------------------------------ |
| Authorized JavaScript origins | `https://{domain}`, `https://www.{domain}` |
| Authorized redirect URI | `{frontend_api_url}/v1/oauth_callback` |

The redirect URI is served by the Frontend API (`clerk.{domain}`), not the Account
Portal (`accounts.{domain}`). Use the `frontend_api_url` returned on the domain
object rather than reconstructing it from the domain name.

15 changes: 14 additions & 1 deletion
packages/cli-core/src/commands/deploy/copy.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,21 @@ export function dnsIntro(domain: string): string[] {
 ];
}

export function clerkSubdomains(domain: string): {
 frontendApi: string;
 accountPortal: string;
 mail: string;
} {
 return {
 frontendApi: `clerk.${domain}`,
 accountPortal: `accounts.${domain}`,
 mail: `clkmail.${domain}`,
 };
}

export function domainAssociationSummary(domain: string): string[] {
 const hosts = [`clerk.${domain}`, `accounts.${domain}`, `clkmail.${domain}`];
 const { frontendApi, accountPortal, mail } = clerkSubdomains(domain);
 const hosts = [frontendApi, accountPortal, mail];
 return [
 `Clerk will associate these subdomains with ${cyan(domain)}:`,
 "",
Expand Down

125 changes: 83 additions & 42 deletions
packages/cli-core/src/commands/deploy/index.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,48 +229,7 @@ describe("deploy", () => {
 mockGetApplicationDomainStatus.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 stubCreateProductionInstance();
 mockTriggerApplicationDomainDNSCheck.mockResolvedValue(
 domainStatus({ status: "complete", dns: true, ssl: true, mail: true }),
 );
Expand DownExpand Up@@ -314,6 +273,56 @@ describe("deploy", () => {
 return deploy(options);
 }

 function stubCreateProductionInstance(
 overrides: {
 frontendApiUrl?: string;
 cnameTargets?: { host: string; value: string; required: boolean }[];
 } = {},
 ) {
 mockCreateProductionInstance.mockImplementation(
 (_appId: string, params: { domain: string }) => {
 const hostname = params.domain;
 return {
 object: "instance",
 id: "ins_prod_mock",
 environment_type: "production" as const,
 active_domain: {
 object: "domain",
 id: "dmn_prod_mock",
 name: hostname,
 is_satellite: false,
 is_provider_domain: false,
 frontend_api_url: overrides.frontendApiUrl ?? `https://clerk.${hostname}`,
 development_origin: "",
 cname_targets: overrides.cnameTargets ?? [
 {
 host: `clerk.${hostname}`,
 value: "frontend-api.clerk.services",
 required: true,
 },
 {
 host: `accounts.${hostname}`,
 value: "accounts.clerk.services",
 required: true,
 },
 {
 host: `clkmail.${hostname}`,
 value: `mail.${hostname}.nam1.clerk.services`,
 required: true,
 },
 ],
 created_at: "2026-05-06T00:00:00Z",
 updated_at: "2026-05-06T00:00:00Z",
 },
 publishable_key: "pk_live_test",
 secret_key: "sk_live_test",
 created_at: 1770000000000,
 updated_at: 1770000000000,
 };
 },
 );
 }

 async function runDeployUntilPause(options: Parameters<typeof deploy>[0] = {}) {
 try {
 await runDeploy(options);
Expand DownExpand Up@@ -1208,6 +1217,38 @@ describe("deploy", () => {
 client_secret: "github-secret",
 },
 });
 const err = stripAnsi(captured.err);
 expect(err).toContain("https://clerk.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("OAuth walkthrough prints the Frontend API redirect URI from the created domain", async () => {
 await linkedProject();
 mockIsAgent.mockReturnValue(false);
 // Distinctive URL proves the value is threaded from the API response
 // rather than string-built from the domain name.
 stubCreateProductionInstance({
 frontendApiUrl: "https://clerk-fapi.example.com",
 cnameTargets: [],
 });
 mockConfirm
 .mockResolvedValueOnce(true) // Proceed?
 .mockResolvedValueOnce(true); // Create production instance?
 mockOpenBrowser.mockResolvedValueOnce({ ok: true, launcher: "test" });
 mockSelect
 .mockResolvedValueOnce("walkthrough") // Google OAuth credentials
 .mockResolvedValueOnce("have-credentials")
 .mockResolvedValueOnce("skip"); // DNS verification
 mockInput.mockResolvedValueOnce("example.com").mockResolvedValueOnce("fake-client-id-12345");
 mockPassword.mockResolvedValueOnce("fake-secret");

 await runDeploy({});
 const err = stripAnsi(captured.err);

 // The callback is a Frontend API endpoint; the walkthrough must print the
 // API-reported frontend_api_url, never the Account Portal subdomain.
 expect(err).toContain("https://clerk-fapi.example.com/v1/oauth_callback");
 expect(err).not.toContain("https://accounts.example.com/v1/oauth_callback");
 });

 test("Apple .p8 file prompt validates path and PEM framing before continuing", async () => {
Expand Down

5 changes: 4 additions & 1 deletion
packages/cli-core/src/commands/deploy/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -195,6 +195,7 @@ async function startNewDeploy(ctx: DeployContext): Promise<void> {
 productionInstanceId: production.id,
 productionDomainId: production.active_domain.id,
 domain: productionDomain,
 frontendApiUrl: production.active_domain.frontend_api_url,
 pending: { type: "oauth", provider: oauthProviders[0]?.provider ?? "google" },
 oauthProviders: oauthProviders.map((descriptor) => descriptor.provider),
 completedOAuthProviders,
Expand DownExpand Up@@ -521,6 +522,7 @@ async function runOAuthSetup(
 descriptor,
 state.domain,
 productionInstanceId,
 state.frontendApiUrl,
 );
 if (!saved) {
 throw deployPausedError({
Expand DownExpand Up@@ -556,6 +558,7 @@ async function collectAndSaveOAuthCredentials(
 descriptor: OAuthProviderDescriptor,
 domain: string,
 productionInstanceId: string,
 frontendApiUrl?: string,
): Promise<boolean> {
 for (const line of providerSetupIntro(descriptor)) log.info(line);
 log.blank();
Expand All@@ -567,7 +570,7 @@ async function collectAndSaveOAuthCredentials(
 }

 if (choice === "walkthrough") {
 await showOAuthWalkthrough(descriptor, domain);
 await showOAuthWalkthrough(descriptor, domain, frontendApiUrl);
 choice = await chooseOAuthCredentialAction(descriptor, { includeWalkthrough: false });
 if (choice === "skip") {
 return false;
Expand Down

22 changes: 19 additions & 3 deletions
packages/cli-core/src/commands/deploy/providers.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import { OAUTH_PROVIDERS } from "@clerk/shared/oauth";
import { bold, cyan, dim, yellow } from "../../lib/color.ts";
import { clerkSubdomains } from "./copy.ts";
import { log } from "../../lib/log.ts";
import { openBrowser } from "../../lib/open.ts";
import type { ConfigSchemaProperty, InstanceConfigSchema } from "../../lib/plapi.ts";
Expand DownExpand Up@@ -433,24 +434,39 @@ export function providerSetupIntro(provider: OAuthProvider | OAuthProviderDescri
 return [bold(`Configure ${label} OAuth for production`), setupCopy, dim(`Reference: ${docsUrl}`)];
}

function oauthWalkthroughUrls(
 domain: string,
 frontendApiUrl?: string,
): { authorizedOrigins: string[]; redirectUri: string } {
 const callbackBase =
 frontendApiUrl?.replace(/\/+$/, "") ?? `https://${clerkSubdomains(domain).frontendApi}`;
 return {
 authorizedOrigins: [`https://${domain}`, `https://www.${domain}`],
 redirectUri: `${callbackBase}/v1/oauth_callback`,
 };
}

/**
 * Show OAuth provider walkthrough values and open provider docs.
 */
export async function showOAuthWalkthrough(
 provider: OAuthProvider | OAuthProviderDescriptor,
 domain: string,
 frontendApiUrl?: string,
): Promise<void> {
 const descriptor = providerDescriptorFromInput(provider);
 const slug = descriptor?.provider ?? (provider as OAuthProvider);
 const label = descriptor?.label ?? providerLabel(slug);
 const docsUrl = descriptor?.docsUrl ?? providerDocsUrl(slug);
 const { authorizedOrigins, redirectUri } = oauthWalkthroughUrls(domain, frontendApiUrl);

 log.info(`\nConfigure your ${bold(label)} OAuth app with these values:\n`);
 log.info(` ${dim("Authorized JavaScript origins")}`);
 log.info(` ${cyan(`https://${domain}`)}`);
 log.info(` ${cyan(`https://www.${domain}`)}`);
 for (const origin of authorizedOrigins) {
 log.info(` ${cyan(origin)}`);
 }
 log.info(` ${dim(descriptor?.redirectLabel ?? providerRedirectLabel(slug))}`);
 log.info(` ${cyan(`https://accounts.${domain}/v1/oauth_callback`)}`);
 log.info(` ${cyan(redirectUri)}`);
 const gotcha = descriptor?.gotcha ?? providerGotcha(slug);
 if (gotcha) {
 log.blank();
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/state.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ export type DeployOperationState = {
 productionInstanceId?: string;
 productionDomainId?: string;
 domain: string;
 frontendApiUrl?: string;
 pending: { type: "dns" } | { type: "oauth"; provider: string };
 oauthProviders: string[];
 completedOAuthProviders: string[];
Expand Down

1 change: 1 addition & 0 deletions
packages/cli-core/src/commands/deploy/status.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -217,6 +217,7 @@ export async function resolveLiveDeploySnapshot(
 productionInstanceId,
 productionDomainId: domain.id,
 domain: domain.name,
 frontendApiUrl: domain.frontend_api_url,
 oauthProviders,
 oauthProviderDescriptors,
 completedOAuthProviders,
Expand Down