better error message when org not whitelisted

Author: odacrem

packages/store/src/commands/store/copy.test.ts

@@ -7,7 +7,6 @@ import {MockApiClient} from '../../services/store/mock/mock-api-client.js'
 import {ensureOrgHasBulkDataAccess} from '../../services/store/utils/store-utils.js'
 import {describe, vi, expect, test, beforeEach} from 'vitest'
 import {Config, loadHelpClass} from '@oclif/core'
-import {renderError} from '@shopify/cli-kit/node/ui'
 
 vi.mock('@shopify/cli-kit/node/ui')
 vi.mock('../../services/store/operations/store-copy.js')
@@ -168,19 +167,6 @@ describe('Copy', () => {
       )
     })
 
-    test('should throw error when no organizations have access to bulk data operations', async () => {
-      vi.mocked(ensureOrgHasBulkDataAccess).mockResolvedValue(false)
-
-      await expect(run(['--fromStore=source.myshopify.com', '--toStore=target.myshopify.com'])).rejects.toThrow(
-        'Process exit called',
-      )
-      expect(renderError).toHaveBeenCalledWith({
-        headline: 'Operation failed',
-        body: `This command is only available to Early Access Program members.`,
-      })
-      expect(process.exit).toHaveBeenCalledWith(1)
-    })
-
     test('should show help when invalid flag combination', async () => {
       await run(['--toFile=output.sqlite'])
 

packages/store/src/commands/store/copy.ts

@@ -8,7 +8,6 @@ import {StoreImportOperation} from '../../services/store/operations/store-import
 import {ApiClient} from '../../services/store/api/api-client.js'
 import {MockApiClient} from '../../services/store/mock/mock-api-client.js'
 import {Organization} from '../../apis/destinations/index.js'
-import {ensureOrgHasBulkDataAccess} from '../../services/store/utils/store-utils.js'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
 import {joinPath, cwd} from '@shopify/cli-kit/node/path'
 import {loadHelpClass} from '@oclif/core'
@@ -33,18 +32,6 @@ export default class Copy extends BaseBDCommand {
     const bpSession = await apiClient.ensureAuthenticatedBusinessPlatform()
     const allOrgs = await apiClient.fetchOrganizations(bpSession)
 
-    const accessChecks = await Promise.all(
-      allOrgs.map(async (org) => ({
-        org,
-        hasAccess: await ensureOrgHasBulkDataAccess(org.id, bpSession, apiClient),
-      })),
-    )
-
-    const orgsWithAccess = accessChecks.filter(({hasAccess}) => hasAccess).map(({org}) => org)
-    if (orgsWithAccess.length === 0) {
-      throw new Error(`This command is only available to Early Access Program members.`)
-    }
-
     const {fromStore, toStore, fromFile, _} = this.flags
     let {toFile} = this.flags
     const operationMode = this.determineOperationMode(fromStore, toStore, fromFile, toFile)
@@ -59,7 +46,7 @@ export default class Copy extends BaseBDCommand {
       toFile = joinPath(cwd(), `${storeDomain}-export-${Date.now()}.sqlite`)
     }
 
-    const operation = this.getOperation(operationMode, bpSession, apiClient, orgsWithAccess)
+    const operation = this.getOperation(operationMode, bpSession, apiClient, allOrgs)
     const source = fromStore ?? fromFile
     const destination = toStore ?? toFile
     await operation.execute(source as string, destination as string, this.flags)

packages/store/src/lib/base-command.ts

@@ -1,4 +1,5 @@
 import {FlagOptions} from './types.js'
+import {checkForUndefinedFieldError} from '../services/store/utils/graphql-errors.js'
 import Command from '@shopify/cli-kit/node/base-command'
 import {renderError} from '@shopify/cli-kit/node/ui'
 
@@ -12,9 +13,13 @@ export abstract class BaseBDCommand extends Command {
       await this.runCommand()
     } catch (error) {
       if (error instanceof Error) {
+        let errorMessage = error.message || 'An unknown error occurred'
+        if (checkForUndefinedFieldError(error)) {
+          errorMessage = `This command is in Early Accesss and is not yet available for the requested store(s).`
+        }
         renderError({
           headline: `Operation failed`,
-          body: error.message,
+          body: errorMessage,
         })
         process.exit(1)
       } else {

packages/store/src/services/store/utils/graphql-errors.ts

@@ -0,0 +1,14 @@
+export function checkForUndefinedFieldError(error: Error): boolean {
+  if (error.name === 'GraphQLClientError') {
+    const graphQLError = error as Error & {
+      errors?: {message: string; extensions?: {code: string; fieldName: string}}[]
+    }
+    if (graphQLError.errors && graphQLError.errors.length > 0) {
+      const undefinedField = graphQLError.errors.find((err) => err.extensions?.code === 'undefinedField')
+      if (undefinedField && undefinedField.extensions?.fieldName.includes('bulkDataStore')) {
+        return true
+      }
+    }
+  }
+  return false
+}