Merge pull request #6738 from Shopify/eric-lee-allow_graphql_queries_on_prod_stores

Add support for executing GraphQL queries on non-dev stores

Author: ericlee878

…s/generated/fetch_dev_store_by_domain.ts …tions/generated/fetch_store_by_domain.tspackages/app/src/cli/api/graphql/business-platform-organizations/generated/fetch_dev_store_by_domain.ts renamed to packages/app/src/cli/api/graphql/business-platform-organizations/generated/fetch_store_by_domain.ts packages/app/src/cli/api/graphql/business-platform-organizations/generated/fetch_dev_store_by_domain.ts renamed to packages/app/src/cli/api/graphql/business-platform-organizations/generated/fetch_store_by_domain.ts

@@ -3,11 +3,12 @@ import * as Types from './types.js'
 
 import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
 
-export type FetchDevStoreByDomainQueryVariables = Types.Exact<{
+export type FetchStoreByDomainQueryVariables = Types.Exact<{
   domain?: Types.InputMaybe<Types.Scalars['String']['input']>
+  storeTypes: Types.Scalars['String']['input']
 }>
 
-export type FetchDevStoreByDomainQuery = {
+export type FetchStoreByDomainQuery = {
   organization?: {
     id: string
     name: string
@@ -28,19 +29,24 @@ export type FetchDevStoreByDomainQuery = {
   } | null
 }
 
-export const FetchDevStoreByDomain = {
+export const FetchStoreByDomain = {
   kind: 'Document',
   definitions: [
     {
       kind: 'OperationDefinition',
       operation: 'query',
-      name: {kind: 'Name', value: 'FetchDevStoreByDomain'},
+      name: {kind: 'Name', value: 'FetchStoreByDomain'},
       variableDefinitions: [
         {
           kind: 'VariableDefinition',
           variable: {kind: 'Variable', name: {kind: 'Name', value: 'domain'}},
           type: {kind: 'NamedType', name: {kind: 'Name', value: 'String'}},
         },
+        {
+          kind: 'VariableDefinition',
+          variable: {kind: 'Variable', name: {kind: 'Name', value: 'storeTypes'}},
+          type: {kind: 'NonNullType', type: {kind: 'NamedType', name: {kind: 'Name', value: 'String'}}},
+        },
       ],
       selectionSet: {
         kind: 'SelectionSet',
@@ -71,12 +77,12 @@ export const FetchDevStoreByDomain = {
                           {
                             kind: 'ObjectField',
                             name: {kind: 'Name', value: 'operator'},
-                            value: {kind: 'EnumValue', value: 'EQUALS'},
+                            value: {kind: 'EnumValue', value: 'IN'},
                           },
                           {
                             kind: 'ObjectField',
                             name: {kind: 'Name', value: 'value'},
-                            value: {kind: 'StringValue', value: 'app_development', block: false},
+                            value: {kind: 'Variable', name: {kind: 'Name', value: 'storeTypes'}},
                           },
                         ],
                       },
@@ -140,4 +146,4 @@ export const FetchDevStoreByDomain = {
       },
     },
   ],
-} as unknown as DocumentNode<FetchDevStoreByDomainQuery, FetchDevStoreByDomainQueryVariables>
+} as unknown as DocumentNode<FetchStoreByDomainQuery, FetchStoreByDomainQueryVariables>

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

@@ -0,0 +1,22 @@
+query FetchStoreByDomain($domain: String, $storeTypes: String!) {
+  organization {
+    id
+    name
+    accessibleShops(filters: {field: STORE_TYPE, operator: IN, value: $storeTypes}, search: $domain) {
+      edges {
+        node {
+          id
+          externalId
+          name
+          storeType
+          primaryDomain
+          shortName
+          url
+        }
+      }
+    }
+    currentUser {
+      organizationPermissions
+    }
+  }
+}

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

@@ -26,7 +26,7 @@ export default class BulkExecute extends AppLinkedCommand {
     await executeBulkOperation({
       organization: appContextResult.organization,
       remoteApp: appContextResult.remoteApp,
-      storeFqdn: store.shopDomain,
+      store,
       query,
       variables: flags.variables,
       variableFile: flags['variable-file'],

packages/app/src/cli/commands/app/bulk/execute.ts

@@ -25,7 +25,7 @@ export default class Execute extends AppLinkedCommand {
     await executeOperation({
       organization: appContextResult.organization,
       remoteApp: appContextResult.remoteApp,
-      storeFqdn: store.shopDomain,
+      store,
       query,
       variables: flags.variables,
       variableFile: flags['variable-file'],

packages/app/src/cli/commands/app/execute.ts

@@ -38,6 +38,7 @@ import {
   DevSessionCreateOptions,
   DevSessionDeleteOptions,
   DevSessionUpdateOptions,
+  Store,
 } from '../../utilities/developer-platform-client.js'
 import {AllAppExtensionRegistrationsQuerySchema} from '../../api/graphql/all_app_extension_registrations.js'
 import {AppDeploySchema, AppDeployVariables} from '../../api/graphql/app_deploy.js'
@@ -1439,7 +1440,7 @@ export function testDeveloperPlatformClient(stubs: Partial<DeveloperPlatformClie
       Promise.resolve({organization: testOrganization(), apps: [testOrganizationApp()], hasMorePages: false}),
     createApp: (_organization: Organization, _options: CreateAppOptions) => Promise.resolve(testOrganizationApp()),
     devStoresForOrg: (_organizationId: string) => Promise.resolve({stores: [], hasMorePages: false}),
-    storeByDomain: (_orgId: string, _shopDomain: string) => Promise.resolve(undefined),
+    storeByDomain: (_orgId: string, _shopDomain: string, _storeTypes: Store[]) => Promise.resolve(undefined),
     ensureUserAccessToStore: (_orgId: string, _store: OrganizationStore) => Promise.resolve(),
     appExtensionRegistrations: (_app: MinimalAppIdentifiers) => Promise.resolve(emptyAppExtensionRegistrations),
     appVersions: (_app: MinimalAppIdentifiers) => Promise.resolve(emptyAppVersions),

packages/app/src/cli/models/app/app.test-data.ts

@@ -60,4 +60,5 @@ export interface OrganizationStore {
   transferDisabled: boolean
   convertableToPartnerTest: boolean
   provisionable: boolean
+  storeType?: string
 }

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

@@ -203,6 +203,19 @@ describe('getBulkOperationStatus', () => {
     )
   })
 
+  test('uses resolved API version in admin request', async () => {
+    vi.mocked(resolveApiVersion).mockResolvedValue('test-api-version')
+    vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperation({status: 'RUNNING'}))
+
+    await getBulkOperationStatus({organization: mockOrganization, storeFqdn, operationId, remoteApp})
+
+    expect(adminRequestDoc).toHaveBeenCalledWith(
+      expect.objectContaining({
+        version: 'test-api-version',
+      }),
+    )
+  })
+
   describe('time formatting', () => {
     test('uses "Started" for running operations', async () => {
       vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperation({status: 'RUNNING'}))
@@ -386,4 +399,17 @@ describe('listBulkOperations', () => {
       }),
     )
   })
+
+  test('uses resolved API version in admin request', async () => {
+    vi.mocked(resolveApiVersion).mockResolvedValue('test-api-version')
+    vi.mocked(adminRequestDoc).mockResolvedValue(mockBulkOperationsList([]))
+
+    await listBulkOperations({organization: mockOrganization, storeFqdn, remoteApp})
+
+    expect(adminRequestDoc).toHaveBeenCalledWith(
+      expect.objectContaining({
+        version: 'test-api-version',
+      }),
+    )
+  })
 })