fix hostname defaults and overrides

Author: clavery

packages/b2c-tooling/src/auth/oauth-implicit.ts

@@ -4,8 +4,8 @@ import {URL} from 'node:url';
 import type {AuthStrategy, AccessTokenResponse, DecodedJWT} from './types.js';
 import {getLogger} from '../logging/logger.js';
 import {decodeJWT} from './oauth.js';
+import {DEFAULT_ACCOUNT_MANAGER_HOST} from '../defaults.js';
 
-const DEFAULT_ACCOUNT_MANAGER_HOST = 'account.demandware.com';
 const DEFAULT_LOCAL_PORT = 8080;
 
 // Module-level token cache to support multiple instances with same clientId

packages/b2c-tooling/src/auth/oauth.ts

@@ -1,7 +1,6 @@
 import type {AuthStrategy, AccessTokenResponse, DecodedJWT} from './types.js';
 import {getLogger} from '../logging/logger.js';
-
-const DEFAULT_ACCOUNT_MANAGER_HOST = 'account.demandware.com';
+import {DEFAULT_ACCOUNT_MANAGER_HOST} from '../defaults.js';
 
 // Module-level token cache to support multiple instances with same clientId
 const ACCESS_TOKEN_CACHE: Map<string, AccessTokenResponse> = new Map();

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

@@ -5,6 +5,7 @@ import type {ResolvedConfig, LoadConfigOptions, AuthMethod} from './config.js';
 import {OAuthStrategy} from '../auth/oauth.js';
 import {ImplicitOAuthStrategy} from '../auth/oauth-implicit.js';
 import {t} from '../i18n/index.js';
+import {DEFAULT_ACCOUNT_MANAGER_HOST} from '../defaults.js';
 
 /**
  * Base command for operations requiring OAuth authentication.
@@ -47,6 +48,12 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
       options: ALL_AUTH_METHODS,
       helpGroup: 'AUTH',
     }),
+    'account-manager-host': Flags.string({
+      description: 'Account Manager hostname for OAuth',
+      env: 'SFCC_ACCOUNT_MANAGER_HOST',
+      default: DEFAULT_ACCOUNT_MANAGER_HOST,
+      helpGroup: 'AUTH',
+    }),
   };
 
   /**
@@ -96,6 +103,13 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
     return config;
   }
 
+  /**
+   * Gets the configured Account Manager host.
+   */
+  protected get accountManagerHost(): string {
+    return this.flags['account-manager-host'] ?? DEFAULT_ACCOUNT_MANAGER_HOST;
+  }
+
   /**
    * Gets an OAuth auth strategy based on allowed auth methods and available credentials.
    *
@@ -106,6 +120,7 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
    */
   protected getOAuthStrategy(): OAuthStrategy | ImplicitOAuthStrategy {
     const config = this.resolvedConfig;
+    const accountManagerHost = this.accountManagerHost;
     // Default to client-credentials and implicit if no methods specified
     const allowedMethods = config.authMethods || (['client-credentials', 'implicit'] as AuthMethod[]);
 
@@ -117,6 +132,7 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
               clientId: config.clientId,
               clientSecret: config.clientSecret,
               scopes: config.scopes,
+              accountManagerHost,
             });
           }
           break;
@@ -126,6 +142,7 @@ export abstract class OAuthCommand<T extends typeof Command> extends BaseCommand
             return new ImplicitOAuthStrategy({
               clientId: config.clientId,
               scopes: config.scopes,
+              accountManagerHost,
             });
           }
           break;

packages/b2c-tooling/src/cli/ods-command.ts

@@ -1,11 +1,7 @@
 import {Command, Flags} from '@oclif/core';
 import {OAuthCommand} from './oauth-command.js';
 import {createOdsClient, type OdsClient} from '../clients/ods.js';
-
-/**
- * Default ODS API host.
- */
-const DEFAULT_ODS_HOST = 'admin.dx.commercecloud.salesforce.com';
+import {DEFAULT_ODS_HOST} from '../defaults.js';
 
 /**
  * Base command for ODS (On-Demand Sandbox) operations.
@@ -79,6 +75,6 @@ export abstract class OdsCommand<T extends typeof Command> extends OAuthCommand<
    * Gets the configured ODS API host.
    */
   protected get odsHost(): string {
-    return this.flags.host ?? DEFAULT_ODS_HOST;
+    return this.flags['sandbox-api-host'] ?? DEFAULT_ODS_HOST;
   }
 }

packages/b2c-tooling/src/defaults.ts

@@ -0,0 +1,24 @@
+/**
+ * Centralized default values for B2C Commerce APIs.
+ *
+ * These defaults are used across auth strategies, clients, and CLI commands.
+ * Override via environment variables or CLI flags.
+ *
+ * @module defaults
+ */
+
+/**
+ * Default Account Manager host for OAuth authentication.
+ * Used for client credentials and implicit OAuth flows.
+ *
+ * Environment variable: SFCC_ACCOUNT_MANAGER_HOST
+ */
+export const DEFAULT_ACCOUNT_MANAGER_HOST = 'account.demandware.com';
+
+/**
+ * Default ODS (On-Demand Sandbox) API host.
+ * Used for sandbox management operations.
+ *
+ * Environment variable: SFCC_SANDBOX_API_HOST
+ */
+export const DEFAULT_ODS_HOST = 'admin.dx.commercecloud.salesforce.com';

packages/b2c-tooling/src/index.ts

@@ -112,3 +112,6 @@ export type {JobExecutionResult} from './operations/jobs/index.js';
 // Operations - Sites
 export {listSites, getSite} from './operations/sites/index.js';
 export type {Site} from './operations/sites/index.js';
+
+// Defaults
+export {DEFAULT_ACCOUNT_MANAGER_HOST, DEFAULT_ODS_HOST} from './defaults.js';