Add new option to link for new apps

packages/app/src/cli/services/app/config/link.test.ts

@@ -1577,6 +1577,85 @@ embedded = false
   })
 })
 
+test('existing config is respected when isNewApp is true, config is current and client_id is not the same as remote app', async () => {
+  await inTemporaryDirectory(async (tmp) => {
+    // Given
+    const developerPlatformClient = buildDeveloperPlatformClient()
+    const options: LinkOptions = {
+      directory: tmp,
+      developerPlatformClient,
+      isNewApp: true,
+      configName: 'shopify.app.toml',
+    }
+    const localApp = {
+      configuration: {
+        path: joinPath(tmp, 'shopify.app.toml'),
+        name: 'my app',
+        client_id: 'invalid_client_id_from_template',
+        webhooks: {
+          api_version: '2023-04',
+          subscriptions: [{topics: ['products/create'], uri: 'https://my-app.com/webhooks'}],
+        },
+        application_url: 'https://myapp.com',
+        build: {
+          automatically_update_urls_on_dev: true,
+          dev_store_url: 'my-store.myshopify.com',
+          include_config_on_deploy: true,
+        },
+        access_scopes: {
+          scopes: 'write_products',
+        },
+      } as CurrentAppConfiguration,
+    }
+
+    vi.mocked(loadApp).mockResolvedValue(await mockApp(tmp, localApp, [], 'current'))
+    vi.mocked(fetchOrCreateOrganizationApp).mockResolvedValue(mockRemoteApp({developerPlatformClient}))
+    const remoteConfiguration = {
+      ...DEFAULT_REMOTE_CONFIGURATION,
+      handle: 'handle',
+    }
+    vi.mocked(fetchAppRemoteConfiguration).mockResolvedValue(remoteConfiguration)
+
+    // When
+    await link(options)
+
+    // Then
+    const content = await readFile(joinPath(tmp, 'shopify.app.toml'))
+    const expectedContent = `# Learn more about configuring your app at https://shopify.dev/docs/apps/tools/cli/configuration
+
+client_id = "12345"
+name = "app1"
+handle = "handle"
+application_url = "https://example.com"
+embedded = true
+
+[build]
+automatically_update_urls_on_dev = true
+dev_store_url = "my-store.myshopify.com"
+include_config_on_deploy = true
+
+[access_scopes]
+# Learn more at https://shopify.dev/docs/apps/tools/cli/configuration#access_scopes
+scopes = "write_products"
+use_legacy_install_flow = true
+
+[auth]
+redirect_urls = [ "https://example.com/callback1" ]
+
+[webhooks]
+api_version = "2023-07"
+
+  [[webhooks.subscriptions]]
+  topics = [ "products/create" ]
+  uri = "https://my-app.com/webhooks"
+
+[pos]
+embedded = false
+`
+    expect(content).toEqual(expectedContent)
+  })
+})
+
 async function mockApp(
   directory: string,
   app?: Partial<AppInterface>,

packages/app/src/cli/services/app/config/link.ts

@@ -52,6 +52,7 @@
   configName?: string
   baseConfigName?: string
   developerPlatformClient?: DeveloperPlatformClient
+  isNewApp?: boolean
 }
 
 interface LinkOutput {
@@ -130,7 +131,7 @@
   let developerPlatformClient = await sniffServiceOptionsAndAppConfigToSelectPlatformClient(options)
 
   const {creationOptions, appDirectory: possibleAppDirectory} = await getAppCreationDefaultsFromLocalApp(options)
   const appDirectory = possibleAppDirectory || options.directory
 
   if (options.apiKey) {
     // Remote API Key provided by the caller, so use that app specifically
@@ -280,7 +281,7 @@
         appDirectory: app.directory,
         packageManager: app.packageManager,
       }
-    } else if (app.configuration.client_id === remoteAppApiKey) {
+    } else if (app.configuration.client_id === remoteAppApiKey || options.isNewApp) {
       return {
         state: 'reusable-current-app',
         configFormat: 'current',
@@ -348,7 +349,7 @@
   const currentToml = existingTomls[remoteApp.apiKey]
   if (currentToml) return currentToml
 
   return selectConfigName(localAppInfo.appDirectory || options.directory, remoteApp.title)
 }
 
 /**
@@ -485,8 +486,8 @@
 
 function addRemoteAppHomeConfig(remoteApp: OrganizationApp) {
   const homeConfig = {
     application_url: remoteApp.applicationUrl?.replace(/\/$/, '') || '',
     embedded: remoteApp.embedded === undefined ? true : remoteApp.embedded,
   }
   return remoteApp.preferencesUrl
     ? {
@@ -512,8 +513,8 @@
 
 function addRemoteAppWebhooksConfig(remoteApp: OrganizationApp) {
   const hasAnyPrivacyWebhook =
     remoteApp.gdprWebhooks?.customerDataRequestUrl ||
     remoteApp.gdprWebhooks?.customerDeletionUrl ||
     remoteApp.gdprWebhooks?.shopDeletionUrl
 
   const privacyComplianceContent = {
@@ -526,7 +527,7 @@
 
   return {
     webhooks: {
       api_version: remoteApp.webhookApiVersion || '2023-07',
       ...(hasAnyPrivacyWebhook ? privacyComplianceContent : {}),
     },
   }
@@ -562,7 +563,7 @@
 function addPosConfig(remoteApp: OrganizationApp) {
   return {
     pos: {
       embedded: remoteApp.posEmbedded || false,
     },
   }
 }

packages/app/src/cli/services/init/init.ts

@@ -217,6 +217,7 @@ async function init(options: InitOptions) {
       organizationId: app.organizationId,
       configName: 'shopify.app.toml',
       developerPlatformClient: options.developerPlatformClient,
+      isNewApp: true,
     },
     false,
   )