adding tenant scope

Author: charithaT07

packages/b2c-cli/src/utils/scapi/replications.ts

@@ -26,30 +26,37 @@ export abstract class GranularReplicationsCommand<T extends typeof Command> exte
    * Requires:
    * - shortCode configuration (via b2c config:set --short-code <code>)
    * - OAuth credentials
-   * - organizationId (extracted from tenant-id)
+   * - tenantId (from --tenant-id flag or config)
    */
   protected get granularReplicationsClient(): GranularReplicationsClient {
     if (!this._granularReplicationsClient) {
       const shortCode = this.resolvedConfig.values.shortCode;
-      const organizationId = this.getOrganizationId();
+      const tenantId = this.getTenantId();
 
       if (!shortCode) {
         this.error('shortCode configuration is required. Run: b2c config:set --short-code <code>');
       }
 
       this._granularReplicationsClient = createGranularReplicationsClient(
-        {shortCode, organizationId},
+        {shortCode, tenantId},
         this.getOAuthStrategy(),
       );
     }
     return this._granularReplicationsClient;
   }
 
   /**
-   * Get the organization ID from resolved config.
-   * @throws Error if tenant ID is not provided through any source
+   * Get the organization ID (with f_ecom_ prefix) for API path parameters.
    */
   protected getOrganizationId(): string {
+    return toOrganizationId(this.getTenantId());
+  }
+
+  /**
+   * Get the tenant ID from resolved config.
+   * @throws Error if tenant ID is not provided through any source
+   */
+  protected getTenantId(): string {
     const {tenantId} = this.resolvedConfig.values;
     if (!tenantId) {
       this.error(
@@ -59,6 +66,6 @@ export abstract class GranularReplicationsCommand<T extends typeof Command> exte
         ),
       );
     }
-    return toOrganizationId(tenantId);
+    return tenantId;
   }
 }

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

@@ -560,7 +560,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
     }
 
     // Use oclif's error() for proper exit code and display
-    this.error(err.message, {exit: exitCode});
+    return this.error(err.message, {exit: exitCode});
   }
 
   /**

packages/b2c-tooling-sdk/src/clients/granular-replications.ts

@@ -9,6 +9,9 @@ import type {paths, components} from './granular-replications.generated.js';
 import {createAuthMiddleware, createLoggingMiddleware, createRateLimitMiddleware} from './middleware.js';
 import {globalMiddlewareRegistry, type MiddlewareRegistry} from './middleware-registry.js';
 import {OAuthStrategy} from '../auth/oauth.js';
+import {buildTenantScope, toOrganizationId, normalizeTenantId} from './custom-apis.js';
+
+export {toOrganizationId, normalizeTenantId, buildTenantScope};
 
 export type {paths, components};
 export type GranularReplicationsClient = Client<paths>;
@@ -26,7 +29,7 @@ export type PublishIdResponse = components['schemas']['PublishIdResponse'];
 
 export interface GranularReplicationsClientConfig {
   shortCode: string;
-  organizationId: string;
+  tenantId: string;
   scopes?: string[];
   middlewareRegistry?: MiddlewareRegistry;
 }
@@ -37,7 +40,7 @@ export interface GranularReplicationsClientConfig {
  * The Granular Replications API enables programmatic publishing of individual items
  * (products, price tables, content assets) from staging to production environments.
  *
- * @param config - Client configuration with shortCode and organizationId
+ * @param config - Client configuration with shortCode and tenantId
  * @param auth - OAuth authentication strategy
  * @returns Typed Granular Replications API client
  *
@@ -53,7 +56,7 @@ export interface GranularReplicationsClientConfig {
  *
  * const client = createGranularReplicationsClient({
  *   shortCode: 'kv7kzm78',
- *   organizationId: 'f_ecom_zzxy_prd'
+ *   tenantId: 'zzxy_prd'
  * }, auth);
  *
  * // Queue a product for publishing
@@ -83,8 +86,8 @@ export function createGranularReplicationsClient(
     baseUrl: `https://${config.shortCode}.api.commercecloud.salesforce.com/operation/replications/v1`,
   });
 
-  // OAuth scope handling
-  const requiredScopes = config.scopes ?? ['sfcc.granular-replications.rw'];
+  // Build required scopes: domain scope + tenant-specific scope
+  const requiredScopes = config.scopes ?? ['sfcc.granular-replications.rw', buildTenantScope(config.tenantId)];
   const scopedAuth = auth instanceof OAuthStrategy ? auth.withAdditionalScopes(requiredScopes) : auth;
 
   client.use(createAuthMiddleware(scopedAuth));

packages/b2c-tooling-sdk/test/clients/granular-replications.test.ts

@@ -10,6 +10,7 @@ import {createGranularReplicationsClient} from '../../src/clients/granular-repli
 import {MockAuthStrategy} from '../helpers/mock-auth.js';
 
 const SHORT_CODE = 'kv7kzm78';
+const TENANT_ID = 'zzxy_prd';
 const ORG_ID = 'f_ecom_zzxy_prd';
 const BASE_URL = `https://${SHORT_CODE}.api.commercecloud.salesforce.com/operation/replications/v1`;
 
@@ -24,7 +25,7 @@ describe('Granular Replications Client', () => {
 
   beforeEach(() => {
     mockAuth = new MockAuthStrategy();
-    client = createGranularReplicationsClient({shortCode: SHORT_CODE, organizationId: ORG_ID}, mockAuth);
+    client = createGranularReplicationsClient({shortCode: SHORT_CODE, tenantId: TENANT_ID}, mockAuth);
   });
 
   it('should create client with config', () => {