Handle not having app ID available for function schema operations

Shopify · Dec 16, 2024 · 4413894 · 4413894
1 parent 7866253
commit 4413894
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/packages/app/src/cli/services/generate-schema.test.ts b/packages/app/src/cli/services/generate-schema.test.ts
@@ -122,7 +122,6 @@ describe('generateSchemaService', () => {
           },
           app.configuration.client_id,
           orgId,
-          app.configuration.app_id,
         )
       })
     })
@@ -179,7 +178,6 @@ describe('generateSchemaService', () => {
           },
           app.configuration.client_id,
           orgId,
-          app.configuration.app_id,
         )
       })
     })

diff --git a/packages/app/src/cli/services/generate-schema.ts b/packages/app/src/cli/services/generate-schema.ts
@@ -21,15 +21,13 @@ interface GenerateSchemaOptions {
 export async function generateSchemaService(options: GenerateSchemaOptions) {
   const {extension, stdout, developerPlatformClient, app, orgId} = options
   const apiKey = app.configuration.client_id
-  const appId = app.configuration.app_id
   const {api_version: version, type, targeting} = extension.configuration
   const usingTargets = Boolean(targeting?.length)
   const definition = await (usingTargets
     ? generateSchemaFromTarget({
         localIdentifier: extension.localIdentifier,
         developerPlatformClient,
         apiKey,
-        appId,
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         target: targeting![0]!.target,
         version,
@@ -39,7 +37,6 @@ export async function generateSchemaService(options: GenerateSchemaOptions) {
         localIdentifier: extension.localIdentifier,
         developerPlatformClient,
         apiKey,
-        appId,
         type,
         version,
         orgId,
@@ -58,7 +55,6 @@ interface BaseGenerateSchemaOptions {
   localIdentifier: string
   developerPlatformClient: DeveloperPlatformClient
   apiKey: string
-  appId?: string
   version: string
   orgId: string
 }
@@ -70,7 +66,6 @@ interface GenerateSchemaFromTargetOptions extends BaseGenerateSchemaOptions {
 async function generateSchemaFromTarget({
   localIdentifier,
   developerPlatformClient,
-  appId,
   apiKey,
   target,
   version,
@@ -81,7 +76,7 @@ async function generateSchemaFromTarget({
     version,
   }
   // Api key required for partners reqs, can be removed once fully migrated to AMF
-  const definition = await developerPlatformClient.targetSchemaDefinition(variables, apiKey, orgId, appId)
+  const definition = await developerPlatformClient.targetSchemaDefinition(variables, apiKey, orgId)
 
   if (!definition) {
     throw new AbortError(
@@ -101,7 +96,6 @@ async function generateSchemaFromApiType({
   localIdentifier,
   developerPlatformClient,
   apiKey,
-  appId,
   version,
   type,
   orgId,
@@ -111,7 +105,7 @@ async function generateSchemaFromApiType({
     type,
   }
 
-  const definition = await developerPlatformClient.apiSchemaDefinition(variables, apiKey, orgId, appId)
+  const definition = await developerPlatformClient.apiSchemaDefinition(variables, apiKey, orgId)
 
   if (!definition) {
     throw new AbortError(

diff --git a/packages/app/src/cli/utilities/developer-platform-client.ts b/packages/app/src/cli/utilities/developer-platform-client.ts
@@ -253,13 +253,11 @@ export interface DeveloperPlatformClient {
     input: SchemaDefinitionByTargetQueryVariables,
     apiKey: string,
     organizationId: string,
-    appId?: string,
   ) => Promise<string | null>
   apiSchemaDefinition: (
     input: SchemaDefinitionByApiTypeQueryVariables,
     apiKey: string,
     organizationId: string,
-    appId?: string,
   ) => Promise<string | null>
   migrateToUiExtension: (input: MigrateToUiExtensionVariables) => Promise<MigrateToUiExtensionSchema>
   toExtensionGraphQLType: (input: string) => string

diff --git a/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts b/packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts
@@ -790,12 +790,12 @@ export class AppManagementClient implements DeveloperPlatformClient {
 
   async targetSchemaDefinition(
     input: SchemaDefinitionByTargetQueryVariables,
-    _apiKey: string,
+    apiKey: string,
     organizationId: string,
-    appId?: string,
   ): Promise<string | null> {
     try {
-      const appIdNumber = String(numberFromGid(appId!))
+      const {app} = await this.activeAppVersionRawResult({apiKey, organizationId})
+      const appIdNumber = String(numberFromGid(app.id))
       const token = await this.token()
       const result = await functionsRequestDoc<SchemaDefinitionByTargetQuery, SchemaDefinitionByTargetQueryVariables>(
         organizationId,
@@ -816,12 +816,12 @@ export class AppManagementClient implements DeveloperPlatformClient {
 
   async apiSchemaDefinition(
     input: SchemaDefinitionByApiTypeQueryVariables,
-    _apiKey: string,
+    apiKey: string,
     organizationId: string,
-    appId?: string,
   ): Promise<string | null> {
     try {
-      const appIdNumber = String(numberFromGid(appId!))
+      const {app} = await this.activeAppVersionRawResult({apiKey, organizationId})
+      const appIdNumber = String(numberFromGid(app.id!))
       const token = await this.token()
       const result = await functionsRequestDoc<SchemaDefinitionByApiTypeQuery, SchemaDefinitionByApiTypeQueryVariables>(
         organizationId,

diff --git a/packages/app/src/cli/utilities/developer-platform-client/partners-client.ts b/packages/app/src/cli/utilities/developer-platform-client/partners-client.ts
@@ -510,7 +510,6 @@ export class PartnersClient implements DeveloperPlatformClient {
     input: SchemaDefinitionByTargetQueryVariables,
     apiKey: string,
     _organizationId: string,
-    _appId?: string,
   ): Promise<string | null> {
     // Ensures compatibility with existing partners requests
     // Can remove once migrated to AMF
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,7 +122,6 @@ describe('generateSchemaService', () => { @@
               },
               app.configuration.client_id,
               orgId,
-              app.configuration.app_id,
             )
           })
         })
@@ Expand Down Expand Up / @@ -179,7 +178,6 @@ describe('generateSchemaService', () => { @@
               },
               app.configuration.client_id,
               orgId,
-              app.configuration.app_id,
             )
           })
         })
@@ Expand Down @@