Merge pull request #6430 from Shopify/09-25-fix_dev_stores_with_custom_domains

Fix dev stores with custom domains

Author: isaacroldan

.changeset/config.json

@@ -11,7 +11,7 @@
     "@shopify/theme",
     "@shopify/ui-extensions-dev-console-app",
     "@shopify/plugin-cloudflare",
-    "@shopify/plugin-did-you-mean",
+    "@shopify/plugin-did-you-mean"
   ]],
   "access": "public",
   "baseBranch": "main",

.changeset/thick-walls-explode.md

@@ -0,0 +1,5 @@
+---
+'@shopify/app': patch
+---
+
+Add support to `app dev` for dev stores with custom domains

packages/app/src/cli/api/graphql/business-platform-organizations/generated/list_app_dev_stores.ts

@@ -20,6 +20,7 @@ export type ListAppDevStoresQuery = {
           storeType?: Types.Store | null
           primaryDomain?: string | null
           shortName?: string | null
+          url?: string | null
         }
       }[]
       pageInfo: {hasNextPage: boolean}
@@ -108,6 +109,7 @@ export const ListAppDevStores = {
                                   {kind: 'Field', name: {kind: 'Name', value: 'storeType'}},
                                   {kind: 'Field', name: {kind: 'Name', value: 'primaryDomain'}},
                                   {kind: 'Field', name: {kind: 'Name', value: 'shortName'}},
+                                  {kind: 'Field', name: {kind: 'Name', value: 'url'}},
                                   {kind: 'Field', name: {kind: 'Name', value: '__typename'}},
                                 ],
                               },

packages/app/src/cli/api/graphql/business-platform-organizations/queries/list_app_dev_stores.graphql

@@ -11,6 +11,7 @@ query ListAppDevStores($searchTerm: String) {
           storeType
           primaryDomain
           shortName
+          url
         }
       }
       pageInfo {

packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts

@@ -160,7 +160,7 @@ import {
 import {CLI_KIT_VERSION} from '@shopify/cli-kit/common/version'
 import {versionSatisfies} from '@shopify/cli-kit/node/node-package-manager'
 import {outputDebug} from '@shopify/cli-kit/node/output'
-import {developerDashboardFqdn} from '@shopify/cli-kit/node/context/fqdn'
+import {developerDashboardFqdn, normalizeStoreFqdn} from '@shopify/cli-kit/node/context/fqdn'
 import {TokenItem} from '@shopify/cli-kit/node/ui'
 import {functionsRequestDoc, FunctionsRequestOptions} from '@shopify/cli-kit/node/api/functions'
 import {fileExists, readFile} from '@shopify/cli-kit/node/fs'
@@ -1291,11 +1291,12 @@ function mapBusinessPlatformStoresToOrganizationStores(
   provisionable: boolean,
 ): OrganizationStore[] {
   return storesArray.map((store: ShopNode) => {
-    const {externalId, primaryDomain, name} = store
+    const {externalId, primaryDomain, name, url} = store
+    if (!url) throw new BugError('The selected store does not have a valid URL')
     return {
       shopId: externalId ? idFromEncodedGid(externalId) : undefined,
       link: primaryDomain,
-      shopDomain: primaryDomain,
+      shopDomain: normalizeStoreFqdn(url),
       shopName: name,
       transferDisabled: true,
       convertableToPartnerTest: true,

packages/cli-kit/src/public/node/context/fqdn.test.ts

@@ -209,4 +209,12 @@ describe('normalizeStore', () => {
     // Then
     expect(got).toEqual('example.myshopify.io')
   })
+
+  test('parses store name with admin', async () => {
+    // When
+    const got = await normalizeStoreFqdn('https://example.myshopify.com/admin/')
+
+    // Then
+    expect(got).toEqual('example.myshopify.com')
+  })
 })

packages/cli-kit/src/public/node/context/fqdn.ts

@@ -128,9 +128,12 @@ export async function identityFqdn(): Promise<string> {
  * @param store - Store name.
  * @returns Normalized store name.
  */
-export async function normalizeStoreFqdn(store: string): Promise<string> {
-  const storeFqdn = store.replace(/^https?:\/\//, '').replace(/\/$/, '')
-  const addDomain = async (storeFqdn: string) => {
+export function normalizeStoreFqdn(store: string): string {
+  const storeFqdn = store
+    .replace(/^https?:\/\//, '')
+    .replace(/\/$/, '')
+    .replace(/\/admin$/, '')
+  const addDomain = (storeFqdn: string) => {
     switch (serviceEnvironment()) {
       case 'local':
         return new DevServerCore().host(storeFqdn)