diff --git a/packages/cli-kit/src/public/node/context/fqdn.ts b/packages/cli-kit/src/public/node/context/fqdn.ts index a41be33e16..3919b3a179 100644 --- a/packages/cli-kit/src/public/node/context/fqdn.ts +++ b/packages/cli-kit/src/public/node/context/fqdn.ts @@ -139,5 +139,8 @@ export function normalizeStoreFqdn(store: string): string { } const containDomain = (storeFqdn: string) => storeFqdn.endsWith('.myshopify.com') || storeFqdn.endsWith('shopify.io') || storeFqdn.endsWith('.shop.dev') - return containDomain(storeFqdn) ? storeFqdn : addDomain(storeFqdn) + const normalizedFqdn = containDomain(storeFqdn) ? storeFqdn : addDomain(storeFqdn) + // Use dev-api domain for OAuth redirects in local environment + // See: https://github.com/Shopify/dev_server?tab=readme-ov-file#shop-redirects + return normalizedFqdn.replace('.my.shop.dev', '.dev-api.shop.dev') }