Use orgFromId to validate organization

Author: nickwesselman

packages/app/src/cli/commands/app/init.test.ts

@@ -16,7 +16,6 @@ vi.mock('../../services/init/init.js')
 vi.mock('../../utilities/developer-platform-client.js')
 vi.mock('../../services/context.js')
 vi.mock('../../prompts/dev.js')
-vi.mock('../../services/dev/fetch.js')
 vi.mock('../../services/init/validate.js')
 vi.mock('@shopify/cli-kit/node/fs')
 vi.mock('@shopify/cli-kit/node/node-package-manager')
@@ -76,9 +75,8 @@ describe('Init command', () => {
     vi.mocked(inferPackageManager).mockReturnValue('npm')
     vi.mocked(selectDeveloperPlatformClient).mockReturnValue(mockDeveloperPlatformClient)
 
-    // Mock fetchOrganizations to return the organization
-    const {fetchOrganizations} = await import('../../services/dev/fetch.js')
-    vi.mocked(fetchOrganizations).mockResolvedValue([mockOrganization])
+    // Mock orgFromId to return the organization
+    vi.mocked(mockDeveloperPlatformClient.orgFromId).mockResolvedValue(mockOrganization)
 
     // Mock the orgAndApps method on the developer platform client
     vi.mocked(mockDeveloperPlatformClient.orgAndApps).mockResolvedValue({
@@ -129,9 +127,8 @@ describe('Init command', () => {
       vi.mocked(inferPackageManager).mockReturnValue('npm')
       vi.mocked(selectDeveloperPlatformClient).mockReturnValue(mockDeveloperPlatformClient)
 
-      // Mock fetchOrganizations to return only the valid organization
-      const {fetchOrganizations} = await import('../../services/dev/fetch.js')
-      vi.mocked(fetchOrganizations).mockResolvedValue([validOrg])
+      // Mock orgFromId to return undefined for invalid organization
+      vi.mocked(mockDeveloperPlatformClient.orgFromId).mockResolvedValue(undefined)
 
       vi.mocked(initPrompt).mockResolvedValue({
         template: 'https://github.com/Shopify/shopify-app-template-remix',

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

@@ -7,7 +7,6 @@ import {validateFlavorValue, validateTemplateValue} from '../../services/init/va
 import {MinimalOrganizationApp, Organization, OrganizationApp} from '../../models/organization.js'
 import {appNamePrompt, createAsNewAppPrompt, selectAppPrompt} from '../../prompts/dev.js'
 import {searchForAppsByNameFactory} from '../../services/dev/prompt-helpers.js'
-import {fetchOrganizations} from '../../services/dev/fetch.js'
 import {isValidName} from '../../models/app/validation/common.js'
 import {Flags} from '@oclif/core'
 import {globalFlags} from '@shopify/cli-kit/node/cli'
@@ -102,9 +101,8 @@ export default class Init extends AppLinkedCommand {
     } else {
       let org: Organization
       if (flags['organization-id']) {
-        // If an organization-id is provided, fetch all organizations and find the matching one
-        const orgs = await fetchOrganizations()
-        const matchingOrg = orgs.find((organization) => organization.id === flags['organization-id'])
+        // If an organization-id is provided, fetch the organization directly
+        const matchingOrg = await developerPlatformClient.orgFromId(flags['organization-id'])
         if (!matchingOrg) {
           throw new AbortError(
             `Organization with ID ${flags['organization-id']} not found`,