Every API client config field is optional

Shopify · Apr 3, 2024 · 7c2e424 · 7c2e424
1 parent ede6544
commit 7c2e424
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/packages/app/src/cli/models/app/app.test-data.ts b/packages/app/src/cli/models/app/app.test-data.ts
@@ -157,8 +157,6 @@ export function testOrganizationApp(app: Partial<OrganizationApp> = {}): Organiz
     grantedScopes: [],
     disabledFlags: ['5b25141b'],
     flags: [],
-    applicationUrl: 'https://www.example.com',
-    redirectUrlWhitelist: [],
   }
   return {...defaultApp, ...app}
 }

diff --git a/packages/app/src/cli/models/organization.ts b/packages/app/src/cli/models/organization.ts
@@ -25,8 +25,8 @@ export type OrganizationApp = MinimalOrganizationApp & {
   newApp?: boolean
   grantedScopes: string[]
   developmentStorePreviewEnabled?: boolean
-  applicationUrl: string
-  redirectUrlWhitelist: string[]
+  applicationUrl?: string
+  redirectUrlWhitelist?: string[]
   requestedAccessScopes?: string[]
   webhookApiVersion?: string
   embedded?: boolean

diff --git a/packages/app/src/cli/services/app/config/link.ts b/packages/app/src/cli/services/app/config/link.ts
@@ -226,7 +226,7 @@ function buildRemoteApiClientConfiguration(
 
 function addRemoteAppHomeConfig(remoteApp: OrganizationApp) {
   const homeConfig = {
-    application_url: remoteApp.applicationUrl.replace(/\/$/, ''),
+    application_url: remoteApp.applicationUrl?.replace(/\/$/, '') || '',
     embedded: remoteApp.embedded === undefined ? true : remoteApp.embedded,
   }
   return remoteApp.preferencesUrl
@@ -294,7 +294,7 @@ function addRemoteAppAccessConfig(appConfiguration: AppConfiguration, remoteApp:
   }
   return {
     auth: {
-      redirect_urls: remoteApp.redirectUrlWhitelist,
+      redirect_urls: remoteApp.redirectUrlWhitelist ?? [],
     },
     access_scopes: accessScopesContent,
   }

diff --git a/packages/app/src/cli/services/context.ts b/packages/app/src/cli/services/context.ts
@@ -452,8 +452,6 @@ export async function ensureDeployContext(options: DeployContextOptions): Promis
       organizationId: remoteApp.organizationId,
       grantedScopes: remoteApp.grantedScopes,
       flags: remoteApp.flags,
-      applicationUrl: remoteApp.applicationUrl,
-      redirectUrlWhitelist: remoteApp.redirectUrlWhitelist,
     },
     identifiers,
     release: !noRelease,