nit fix: scapi custom should read config for tenant

Author: clavery

packages/b2c-cli/src/commands/scapi/custom/status.ts

@@ -168,16 +168,7 @@ const tableRenderer = new TableRenderer(COLUMNS);
 /**
  * Base command for SCAPI Custom API operations.
  */
-abstract class ScapiCustomCommand<T extends typeof Command> extends OAuthCommand<T> {
-  static baseFlags = {
-    ...OAuthCommand.baseFlags,
-    'tenant-id': Flags.string({
-      description: 'Organization/tenant ID',
-      env: 'SFCC_TENANT_ID',
-      required: true,
-    }),
-  };
-}
+abstract class ScapiCustomCommand<T extends typeof Command> extends OAuthCommand<T> {}
 
 /**
  * Command to get the status of Custom API endpoints.
@@ -226,7 +217,8 @@ export default class ScapiCustomStatus extends ScapiCustomCommand<typeof ScapiCu
   async run(): Promise<CustomApiStatusResponse> {
     this.requireOAuthCredentials();
 
-    const {'tenant-id': tenantId, status, 'group-by': groupBy} = this.flags;
+    const {status, 'group-by': groupBy} = this.flags;
+    const tenantId = this.requireTenantId();
     const {shortCode} = this.resolvedConfig.values;
 
     if (!shortCode) {

packages/b2c-cli/src/utils/slas/client.ts

@@ -184,22 +184,4 @@ 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;
-  }
 }

packages/b2c-cli/test/commands/scapi/custom/status.test.ts

@@ -51,7 +51,7 @@ describe('scapi custom status', () => {
 
     sinon.stub(command, 'requireOAuthCredentials').returns(void 0);
     sinon.stub(command, 'jsonEnabled').returns(true);
-    sinon.stub(command, 'resolvedConfig').get(() => ({values: {shortCode: 'kv7kzm78'}}));
+    sinon.stub(command, 'resolvedConfig').get(() => ({values: {shortCode: 'kv7kzm78', tenantId: 'zzxy_prd'}}));
 
     sinon.stub(command, 'getOAuthStrategy').returns({
       getAuthorizationHeader: async () => 'Bearer test',
@@ -95,7 +95,7 @@ describe('scapi custom status', () => {
 
     sinon.stub(command, 'requireOAuthCredentials').returns(void 0);
     sinon.stub(command, 'jsonEnabled').returns(true);
-    sinon.stub(command, 'resolvedConfig').get(() => ({values: {shortCode: 'kv7kzm78'}}));
+    sinon.stub(command, 'resolvedConfig').get(() => ({values: {shortCode: 'kv7kzm78', tenantId: 'zzxy_prd'}}));
 
     sinon.stub(command, 'getOAuthStrategy').returns({
       getAuthorizationHeader: async () => 'Bearer test',
@@ -123,7 +123,7 @@ describe('scapi custom status', () => {
     sinon.stub(command, 'requireOAuthCredentials').returns(void 0);
     sinon.stub(command, 'jsonEnabled').returns(false);
     sinon.stub(command, 'log').returns(void 0);
-    sinon.stub(command, 'resolvedConfig').get(() => ({values: {shortCode: 'kv7kzm78'}}));
+    sinon.stub(command, 'resolvedConfig').get(() => ({values: {shortCode: 'kv7kzm78', tenantId: 'zzxy_prd'}}));
 
     sinon.stub(command, 'renderEndpoints').returns(void 0);
 

packages/b2c-tooling-sdk/src/cli/oauth-command.ts

@@ -166,4 +166,22 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
       );
     }
   }
+
+  /**
+   * 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;
+  }
 }