Fix local store domain

gonzaloriestra · gonzaloriestra · commit 86748acbb9e1 · 2025-12-19T11:47:51.000+01:00
diff --git 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')
 }

Original file line number	Diff line number	Diff line change
`@@ -139,5 +139,8 @@ export function normalizeStoreFqdn(store: string): string {`
`139`	`139`	`}`
`140`	`140`	`const containDomain = (storeFqdn: string) =>`
`141`	`141`	`storeFqdn.endsWith('.myshopify.com') \|\| storeFqdn.endsWith('shopify.io') \|\| storeFqdn.endsWith('.shop.dev')`
`142`		`- return containDomain(storeFqdn) ? storeFqdn : addDomain(storeFqdn)`
	`142`	`+ const normalizedFqdn = containDomain(storeFqdn) ? storeFqdn : addDomain(storeFqdn)`
	`143`	`+ // Use dev-api domain for OAuth redirects in local environment`
	`144`	`+ // See: https://github.com/Shopify/dev_server?tab=readme-ov-file#shop-redirects`
	`145`	`+ return normalizedFqdn.replace('.my.shop.dev', '.dev-api.shop.dev')`
`143`	`146`	`}`