Merge pull request #6099 from Shopify/fix-app-proxy-caching

Always regenerate ApplicationURLs during dev

Author: JonathanJChang

packages/app/src/cli/models/app/loader.test.ts

@@ -2342,7 +2342,7 @@ wrong = "property"
     await expect(loadTestingApp()).rejects.toThrow()
   })
 
-  test('preserves values from the previous app when reloading', async () => {
+  test('regenerates devApplicationURLs when reloading', async () => {
     // Given
     const appConfiguration = `
       name = "my-app"
@@ -2355,6 +2355,11 @@ wrong = "property"
 
       [auth]
       redirect_urls = ["https://example.com/auth"]
+
+      [app_proxy]
+      url = "https://example.com"
+      subpath = "updated"
+      prefix = "new"
     `
     await writeConfig(appConfiguration)
 
@@ -2381,11 +2386,16 @@ wrong = "property"
       userProvidedConfigName: undefined,
     })) as AppLinkedInterface
 
-    // Set some values that should be preserved
+    // Set some values that should be regenerated
     const customDevUUID = 'custom-dev-uuid'
     const customAppURLs = {
       applicationUrl: 'http://custom.dev',
       redirectUrlWhitelist: ['http://custom.dev/auth'],
+      appProxy: {
+        proxyUrl: 'https://example.com',
+        proxySubPath: 'initial',
+        proxySubPathPrefix: 'old',
+      },
     }
     app.allExtensions[0]!.devUUID = customDevUUID
     app.setDevApplicationURLs(customAppURLs)
@@ -2395,7 +2405,19 @@ wrong = "property"
 
     // Then
     expect(reloadedApp.allExtensions[0]?.devUUID).toBe(customDevUUID)
-    expect(reloadedApp.devApplicationURLs).toEqual(customAppURLs)
+    expect(reloadedApp.devApplicationURLs).toEqual({
+      applicationUrl: 'http://custom.dev',
+      redirectUrlWhitelist: [
+        'http://custom.dev/auth/callback',
+        'http://custom.dev/auth/shopify/callback',
+        'http://custom.dev/api/auth/callback',
+      ],
+      appProxy: {
+        proxyUrl: 'https://custom.dev',
+        proxySubPath: 'updated',
+        proxySubPathPrefix: 'new',
+      },
+    })
     expect(reloadedApp.name).toBe(app.name)
     expect(reloadedApp.packageManager).toBe(app.packageManager)
     expect(reloadedApp.nodeDependencies).toEqual(app.nodeDependencies)

packages/app/src/cli/models/app/loader.ts

@@ -34,6 +34,7 @@ import {loadLocalExtensionsSpecifications} from '../extensions/load-specificatio
 import {UIExtensionSchemaType} from '../extensions/specifications/ui_extension.js'
 import {patchAppHiddenConfigFile} from '../../services/app/patch-app-configuration-file.js'
 import {getOrCreateAppConfigHiddenPath} from '../../utilities/app/config/hidden-app-config.js'
+import {ApplicationURLs, generateApplicationURLs} from '../../services/dev/urls.js'
 import {showMultipleCLIWarningIfNeeded} from '@shopify/cli-kit/node/multiple-installation-warning'
 import {fileExists, readFile, glob, findPathUp, fileExistsSync} from '@shopify/cli-kit/node/fs'
 import {zod} from '@shopify/cli-kit/node/schema'
@@ -389,7 +390,7 @@ class AppLoader<TConfig extends AppConfiguration, TModuleSpec extends ExtensionS
       configSchema,
       remoteFlags: this.remoteFlags,
       hiddenConfig,
-      devApplicationURLs: this.previousApp?.devApplicationURLs,
+      devApplicationURLs: this.getDevApplicationURLs(configuration, webs),
     })
 
     // Show CLI notifications that are targetted for when your app has specific extension types
@@ -788,6 +789,17 @@ class AppLoader<TConfig extends AppConfiguration, TModuleSpec extends ExtensionS
         })
       })
   }
+
+  private getDevApplicationURLs(currentConfiguration: TConfig, webs: Web[]): ApplicationURLs | undefined {
+    const previousDevUrls = this.previousApp?.devApplicationURLs
+    if (!previousDevUrls || !isCurrentAppSchema(currentConfiguration)) return previousDevUrls
+
+    return generateApplicationURLs(
+      previousDevUrls.applicationUrl,
+      webs.map(({configuration}) => configuration.auth_callback_path).find((path) => path),
+      currentConfiguration.app_proxy,
+    )
+  }
 }
 
 /**