tenant-id at wrong level/config

clavery · clavery · commit 28926858cba5 · 2026-01-22T10:21:11.000-05:00
diff --git a/packages/b2c-cli/src/commands/setup/config.ts b/packages/b2c-cli/src/commands/setup/config.ts
@@ -191,7 +191,16 @@ export default class SetupConfig extends BaseCommand<typeof SetupConfig> {
     );
 
     // SCAPI section
-    this.renderSection(ui, 'SCAPI', [['shortCode', config.shortCode]], fieldSources, unmask);
+    this.renderSection(
+      ui,
+      'SCAPI',
+      [
+        ['shortCode', config.shortCode],
+        ['tenantId', config.tenantId],
+      ],
+      fieldSources,
+      unmask,
+    );
 
     // MRT section
     this.renderSection(
diff --git a/packages/b2c-cli/src/commands/slas/client/create.ts b/packages/b2c-cli/src/commands/slas/client/create.ts
@@ -109,7 +109,6 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
     this.requireOAuthCredentials();
 
     const {
-      'tenant-id': tenantId,
       name,
       channels,
       scopes,
@@ -120,6 +119,7 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
       public: isPublic,
       'create-tenant': createTenant,
     } = this.flags;
+    const tenantId = this.requireTenantId();
 
     // Validate that either --scopes or --default-scopes is provided
     if (!scopes && !useDefaultScopes) {
diff --git a/packages/b2c-cli/src/commands/slas/client/delete.ts b/packages/b2c-cli/src/commands/slas/client/delete.ts
@@ -36,7 +36,7 @@ export default class SlasClientDelete extends SlasClientCommand<typeof SlasClien
   async run(): Promise<DeleteOutput> {
     this.requireOAuthCredentials();
 
-    const {'tenant-id': tenantId} = this.flags;
+    const tenantId = this.requireTenantId();
     const {clientId} = this.args;
 
     if (!this.jsonEnabled()) {
diff --git a/packages/b2c-cli/src/commands/slas/client/get.ts b/packages/b2c-cli/src/commands/slas/client/get.ts
@@ -38,7 +38,7 @@ export default class SlasClientGet extends SlasClientCommand<typeof SlasClientGe
   async run(): Promise<ClientOutput> {
     this.requireOAuthCredentials();
 
-    const {'tenant-id': tenantId} = this.flags;
+    const tenantId = this.requireTenantId();
     const {clientId} = this.args;
 
     if (!this.jsonEnabled()) {
diff --git a/packages/b2c-cli/src/commands/slas/client/list.ts b/packages/b2c-cli/src/commands/slas/client/list.ts
@@ -51,7 +51,7 @@ export default class SlasClientList extends SlasClientCommand<typeof SlasClientL
   async run(): Promise<ClientListOutput> {
     this.requireOAuthCredentials();
 
-    const {'tenant-id': tenantId} = this.flags;
+    const tenantId = this.requireTenantId();
 
     if (!this.jsonEnabled()) {
       this.log(t('commands.slas.client.list.fetching', 'Fetching SLAS clients for tenant {{tenantId}}...', {tenantId}));
diff --git a/packages/b2c-cli/src/commands/slas/client/update.ts b/packages/b2c-cli/src/commands/slas/client/update.ts
@@ -77,7 +77,6 @@ export default class SlasClientUpdate extends SlasClientCommand<typeof SlasClien
     this.requireOAuthCredentials();
 
     const {
-      'tenant-id': tenantId,
       name,
       secret,
       channels,
@@ -87,6 +86,7 @@ export default class SlasClientUpdate extends SlasClientCommand<typeof SlasClien
       replace,
     } = this.flags;
     const {clientId} = this.args;
+    const tenantId = this.requireTenantId();
 
     if (!this.jsonEnabled()) {
       this.log(t('commands.slas.client.update.fetching', 'Fetching SLAS client {{clientId}}...', {clientId}));
diff --git a/packages/b2c-cli/src/utils/ecdn/base-command.ts b/packages/b2c-cli/src/utils/ecdn/base-command.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
-import {Command, Flags} from '@oclif/core';
+import {Command} from '@oclif/core';
 import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {createCdnZonesClient, toOrganizationId, type CdnZonesClient} from '@salesforce/b2c-tooling-sdk/clients';
 import {t} from '../../i18n/index.js';
@@ -17,18 +17,9 @@ export function formatApiError(error: unknown): string {
 
 /**
  * Base command for eCDN operations.
- * Provides tenant-id flag and lazy-loaded CDN Zones client.
+ * Provides lazy-loaded CDN Zones client.
  */
 export abstract class EcdnCommand<T extends typeof Command> extends OAuthCommand<T> {
-  static baseFlags = {
-    ...OAuthCommand.baseFlags,
-    'tenant-id': Flags.string({
-      description: t('flags.tenantId.description', 'Organization/tenant ID'),
-      env: 'SFCC_TENANT_ID',
-      required: true,
-    }),
-  };
-
   private _cdnZonesClient?: CdnZonesClient;
   private _cdnZonesRwClient?: CdnZonesClient;
 
@@ -37,8 +28,7 @@ export abstract class EcdnCommand<T extends typeof Command> extends OAuthCommand
    */
   protected getCdnZonesClient(): CdnZonesClient {
     if (!this._cdnZonesClient) {
-      const {shortCode} = this.resolvedConfig.values;
-      const tenantId = (this.flags as Record<string, string>)['tenant-id'];
+      const {shortCode, tenantId} = this.resolvedConfig.values;
 
       if (!shortCode) {
         this.error(
@@ -48,6 +38,14 @@ export abstract class EcdnCommand<T extends typeof Command> extends OAuthCommand
           ),
         );
       }
+      if (!tenantId) {
+        this.error(
+          t(
+            'error.tenantIdRequired',
+            'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
+          ),
+        );
+      }
 
       const oauthStrategy = this.getOAuthStrategy();
       this._cdnZonesClient = createCdnZonesClient({shortCode, tenantId}, oauthStrategy);
@@ -60,8 +58,7 @@ export abstract class EcdnCommand<T extends typeof Command> extends OAuthCommand
    */
   protected getCdnZonesRwClient(): CdnZonesClient {
     if (!this._cdnZonesRwClient) {
-      const {shortCode} = this.resolvedConfig.values;
-      const tenantId = (this.flags as Record<string, string>)['tenant-id'];
+      const {shortCode, tenantId} = this.resolvedConfig.values;
 
       if (!shortCode) {
         this.error(
@@ -71,6 +68,14 @@ export abstract class EcdnCommand<T extends typeof Command> extends OAuthCommand
           ),
         );
       }
+      if (!tenantId) {
+        this.error(
+          t(
+            'error.tenantIdRequired',
+            'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
+          ),
+        );
+      }
 
       const oauthStrategy = this.getOAuthStrategy();
       this._cdnZonesRwClient = createCdnZonesClient({shortCode, tenantId}, oauthStrategy, {readWrite: true});
@@ -79,10 +84,19 @@ export abstract class EcdnCommand<T extends typeof Command> extends OAuthCommand
   }
 
   /**
-   * Get the organization ID from the tenant-id flag.
+   * Get the organization ID from resolved config.
+   * @throws Error if tenant ID is not provided through any source
    */
   protected getOrganizationId(): string {
-    const tenantId = (this.flags as Record<string, string>)['tenant-id'];
+    const {tenantId} = this.resolvedConfig.values;
+    if (!tenantId) {
+      this.error(
+        t(
+          'error.tenantIdRequired',
+          'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
+        ),
+      );
+    }
     return toOrganizationId(tenantId);
   }
 }
diff --git a/packages/b2c-cli/src/utils/scapi/schemas.ts b/packages/b2c-cli/src/utils/scapi/schemas.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
-import {Command, Flags} from '@oclif/core';
+import {Command} from '@oclif/core';
 import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {
   createScapiSchemasClient,
@@ -25,29 +25,28 @@ export function formatApiError(error: unknown, response: Response): string {
  * Provides common flags and helper methods for interacting with the SCAPI Schemas API.
  */
 export abstract class ScapiSchemasCommand<T extends typeof Command> extends OAuthCommand<T> {
-  static baseFlags = {
-    ...OAuthCommand.baseFlags,
-    'tenant-id': Flags.string({
-      description: t('flags.tenantId.description', 'Organization/tenant ID'),
-      env: 'SFCC_TENANT_ID',
-      required: true,
-    }),
-  };
-
   /**
-   * Get the organization ID from the tenant-id flag.
+   * Get the organization ID from resolved config.
+   * @throws Error if tenant ID is not provided through any source
    */
   protected getOrganizationId(): string {
-    const tenantId = (this.flags as Record<string, string>)['tenant-id'];
+    const {tenantId} = this.resolvedConfig.values;
+    if (!tenantId) {
+      this.error(
+        t(
+          'error.tenantIdRequired',
+          'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
+        ),
+      );
+    }
     return toOrganizationId(tenantId);
   }
 
   /**
-   * Get the SCAPI Schemas client, ensuring short code is configured.
+   * Get the SCAPI Schemas client, ensuring short code and tenant ID are configured.
    */
   protected getSchemasClient(): ScapiSchemasClient {
-    const {shortCode} = this.resolvedConfig.values;
-    const tenantId = (this.flags as Record<string, string>)['tenant-id'];
+    const {shortCode, tenantId} = this.resolvedConfig.values;
 
     if (!shortCode) {
       this.error(
@@ -57,6 +56,14 @@ export abstract class ScapiSchemasCommand<T extends typeof Command> extends OAut
         ),
       );
     }
+    if (!tenantId) {
+      this.error(
+        t(
+          'error.tenantIdRequired',
+          'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
+        ),
+      );
+    }
 
     const oauthStrategy = this.getOAuthStrategy();
     return createScapiSchemasClient({shortCode, tenantId}, oauthStrategy);
diff --git a/packages/b2c-cli/src/utils/slas/client.ts b/packages/b2c-cli/src/utils/slas/client.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
-import {Command, Flags, ux} from '@oclif/core';
+import {Command, ux} from '@oclif/core';
 import cliui from 'cliui';
 import {OAuthCommand} from '@salesforce/b2c-tooling-sdk/cli';
 import {createSlasClient, getApiErrorMessage, type SlasClient, type SlasComponents} from '@salesforce/b2c-tooling-sdk';
@@ -100,15 +100,6 @@ export function formatApiError(error: unknown, response: Response): string {
  * Provides common flags and helper methods.
  */
 export abstract class SlasClientCommand<T extends typeof Command> extends OAuthCommand<T> {
-  static baseFlags = {
-    ...OAuthCommand.baseFlags,
-    'tenant-id': Flags.string({
-      description: 'SLAS tenant ID (organization ID)',
-      env: 'SFCC_TENANT_ID',
-      required: true,
-    }),
-  };
-
   /**
    * Ensure tenant exists, creating it if necessary.
    * This is required before creating SLAS clients.
@@ -193,4 +184,22 @@ export abstract class SlasClientCommand<T extends typeof Command> extends OAuthC
     const oauthStrategy = this.getOAuthStrategy();
     return createSlasClient({shortCode}, oauthStrategy);
   }
+
+  /**
+   * Get the tenant ID from resolved config, throwing if not available.
+   * @throws Error if tenant ID is not provided through any source
+   */
+  protected requireTenantId(): string {
+    const tenantId = this.resolvedConfig.values.tenantId;
+
+    if (!tenantId) {
+      this.error(
+        t(
+          'error.tenantIdRequired',
+          'tenant-id is required. Provide via --tenant-id flag, SFCC_TENANT_ID env var, or tenant-id in dw.json.',
+        ),
+      );
+    }
+    return tenantId;
+  }
 }
diff --git a/packages/b2c-tooling-sdk/src/cli/oauth-command.ts b/packages/b2c-tooling-sdk/src/cli/oauth-command.ts
@@ -49,6 +49,11 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
       env: 'SFCC_SHORTCODE',
       helpGroup: 'AUTH',
     }),
+    'tenant-id': Flags.string({
+      description: 'Organization/tenant ID',
+      env: 'SFCC_TENANT_ID',
+      helpGroup: 'AUTH',
+    }),
     'auth-methods': Flags.string({
       description: 'Allowed auth methods in priority order (comma-separated)',
       env: 'SFCC_AUTH_METHODS',
@@ -93,6 +98,7 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
       clientId: this.flags['client-id'],
       clientSecret: this.flags['client-secret'],
       shortCode: this.flags['short-code'],
+      tenantId: this.flags['tenant-id'],
       authMethods: this.parseAuthMethods(),
       accountManagerHost: this.flags['account-manager-host'],
       // Merge scopes from flags (if provided)
diff --git a/packages/b2c-tooling-sdk/src/config/dw-json.ts b/packages/b2c-tooling-sdk/src/config/dw-json.ts
@@ -63,6 +63,8 @@ export interface DwJsonConfig {
   mrtOrigin?: string;
   /** MRT cloud origin URL (alias) */
   cloudOrigin?: string;
+  /** Tenant/Organization ID for SCAPI */
+  'tenant-id'?: string;
 }
 
 /**
diff --git a/packages/b2c-tooling-sdk/src/config/mapping.ts b/packages/b2c-tooling-sdk/src/config/mapping.ts
@@ -49,6 +49,7 @@ export function mapDwJsonToNormalizedConfig(json: DwJsonConfig): NormalizedConfi
     scopes: json['oauth-scopes'],
     // Support multiple field names for short code (priority order)
     shortCode: json.shortCode || json['short-code'] || json['scapi-shortcode'],
+    tenantId: json['tenant-id'],
     instanceName: json.name,
     authMethods: json['auth-methods'],
     accountManagerHost: json['account-manager-host'],
@@ -153,6 +154,7 @@ export function mergeConfigsWithProtection(
       authMethods: overrides.authMethods ?? base.authMethods,
       accountManagerHost: overrides.accountManagerHost ?? base.accountManagerHost,
       shortCode: overrides.shortCode ?? base.shortCode,
+      tenantId: overrides.tenantId ?? base.tenantId,
       instanceName: overrides.instanceName ?? base.instanceName,
       mrtProject: overrides.mrtProject ?? base.mrtProject,
       mrtEnvironment: overrides.mrtEnvironment ?? base.mrtEnvironment,
diff --git a/packages/b2c-tooling-sdk/src/config/types.ts b/packages/b2c-tooling-sdk/src/config/types.ts
@@ -52,6 +52,8 @@ export interface NormalizedConfig {
   // SCAPI
   /** SCAPI short code */
   shortCode?: string;
+  /** Tenant/Organization ID for SCAPI */
+  tenantId?: string;
 
   // MRT fields
   /** MRT project slug */
diff --git a/packages/b2c-tooling-sdk/test/config/resolver.test.ts b/packages/b2c-tooling-sdk/test/config/resolver.test.ts
@@ -55,6 +55,30 @@ describe('config/resolver', () => {
         expect(sources[0].name).to.equal('test');
       });
 
+      it('resolves tenantId from source', () => {
+        const source = new MockSource('test', {
+          hostname: 'example.demandware.net',
+          tenantId: 'test_prd',
+        });
+        const resolver = new ConfigResolver([source]);
+
+        const {config} = resolver.resolve();
+
+        expect(config.tenantId).to.equal('test_prd');
+      });
+
+      it('allows overrides to take precedence for tenantId', () => {
+        const source = new MockSource('test', {
+          hostname: 'example.demandware.net',
+          tenantId: 'source_prd',
+        });
+        const resolver = new ConfigResolver([source]);
+
+        const {config} = resolver.resolve({tenantId: 'override_prd'});
+
+        expect(config.tenantId).to.equal('override_prd');
+      });
+
       it('applies overrides with highest priority', () => {
         const source = new MockSource('test', {
           hostname: 'source.demandware.net',
diff --git a/packages/b2c-tooling-sdk/test/config/sources.test.ts b/packages/b2c-tooling-sdk/test/config/sources.test.ts
