add organization-id flag to suppress organization selection

Author: nickwesselman

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

@@ -7,6 +7,7 @@ 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'
@@ -64,6 +65,12 @@ export default class Init extends AppLinkedCommand {
       env: 'SHOPIFY_FLAG_CLIENT_ID',
       exclusive: ['config'],
     }),
+    'organization-id': Flags.string({
+      hidden: false,
+      description:
+        'The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>',
+      env: 'SHOPIFY_FLAG_ORGANIZATION_ID',
+    }),
   }
 
   async run(): Promise<AppLinkedCommandOutput> {
@@ -93,7 +100,21 @@ export default class Init extends AppLinkedCommand {
       developerPlatformClient = selectedApp.developerPlatformClient ?? developerPlatformClient
       selectAppResult = {result: 'existing', app: selectedApp}
     } else {
-      const org = await selectOrg()
+      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 (!matchingOrg) {
+          throw new AbortError(
+            `Organization with ID ${flags['organization-id']} not found`,
+            'Please verify the organization ID and try again. You can find your organization ID in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>',
+          )
+        }
+        org = matchingOrg
+      } else {
+        org = await selectOrg()
+      }
       developerPlatformClient = selectDeveloperPlatformClient({organization: org})
       const {organization, apps, hasMorePages} = await developerPlatformClient.orgAndApps(org.id)
       selectAppResult = await selectAppOrNewAppName(name, apps, hasMorePages, organization, developerPlatformClient)

packages/cli/README.md

@@ -581,8 +581,8 @@ Create a new app project
 
 ```
 USAGE
-  $ shopify app init [--client-id <value> | ] [--flavor <value>] [-n <value>] [--no-color] [-d
-    npm|yarn|pnpm|bun] [-p <value>] [--template <value>] [--verbose]
+  $ shopify app init [--client-id <value> | ] [--flavor <value>] [-n <value>] [--no-color] [--organization-id
+    <value>] [-d npm|yarn|pnpm|bun] [-p <value>] [--template <value>] [--verbose]
 
 FLAGS
   -d, --package-manager=<option>  <options: npm|yarn|pnpm|bun>
@@ -592,6 +592,8 @@ FLAGS
                                   existing app. Using this flag avoids the app selection prompt.
       --flavor=<value>            Which flavor of the given template to use.
       --no-color                  Disable color output.
+      --organization-id=<value>   The organization ID. Your organization ID can be found in your Dev Dashboard URL:
+                                  https://dev.shopify.com/dashboard/<organization-id>.
       --template=<value>          The app template. Accepts one of the following:
                                   - <reactRouter|remix|none>
                                   - Any GitHub repo with optional branch and subpath, e.g.,

packages/cli/oclif.manifest.json

@@ -1896,6 +1896,15 @@
           "name": "no-color",
           "type": "boolean"
         },
+        "organization-id": {
+          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>.",
+          "env": "SHOPIFY_FLAG_ORGANIZATION_ID",
+          "hasDynamicHelp": false,
+          "hidden": false,
+          "multiple": false,
+          "name": "organization-id",
+          "type": "option"
+        },
         "package-manager": {
           "char": "d",
           "env": "SHOPIFY_FLAG_PACKAGE_MANAGER",

packages/create-app/oclif.manifest.json

@@ -51,6 +51,15 @@
           "name": "no-color",
           "type": "boolean"
         },
+        "organization-id": {
+          "description": "The organization ID. Your organization ID can be found in your Dev Dashboard URL: https://dev.shopify.com/dashboard/<organization-id>.",
+          "env": "SHOPIFY_FLAG_ORGANIZATION_ID",
+          "hasDynamicHelp": false,
+          "hidden": false,
+          "multiple": false,
+          "name": "organization-id",
+          "type": "option"
+        },
         "package-manager": {
           "char": "d",
           "env": "SHOPIFY_FLAG_PACKAGE_MANAGER",