config loading options for plugins

Author: clavery

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

@@ -220,13 +220,17 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
    * - `pluginSourcesAfter`: Low priority sources (fill gaps)
    */
   protected async collectPluginConfigSources(): Promise<void> {
+    // Access flags that may be defined in subclasses (OAuthCommand, InstanceCommand)
+    const flags = this.flags as Record<string, unknown>;
+
     const hookOptions: ConfigSourcesHookOptions = {
       instance: this.flags.instance,
       configPath: this.flags.config,
-      flags: this.flags as Record<string, unknown>,
+      flags,
       resolveOptions: {
         instance: this.flags.instance,
         configPath: this.flags.config,
+        accountManagerHost: flags['account-manager-host'] as string | undefined,
       },
     };
 

packages/b2c-tooling-sdk/src/cli/config.ts

@@ -34,6 +34,8 @@ export interface LoadConfigOptions {
   cloudOrigin?: string;
   /** Path to custom MRT credentials file (overrides default ~/.mobify) */
   credentialsFile?: string;
+  /** Account Manager hostname for OAuth (passed to plugins for host-specific config) */
+  accountManagerHost?: string;
 }
 
 /**
@@ -100,6 +102,7 @@ export function loadConfig(
     hostnameProtection: true,
     cloudOrigin: options.cloudOrigin,
     credentialsFile: options.credentialsFile,
+    accountManagerHost: options.accountManagerHost,
     sourcesBefore: pluginSources.before,
     sourcesAfter: pluginSources.after,
   });

packages/b2c-tooling-sdk/src/config/dw-json.ts

@@ -53,6 +53,8 @@ export interface DwJsonConfig {
   'secure-server'?: string;
   /** Allowed authentication methods in priority order */
   'auth-methods'?: AuthMethod[];
+  /** Account Manager hostname for OAuth */
+  'account-manager-host'?: string;
   /** MRT project slug */
   mrtProject?: string;
   /** MRT environment name (e.g., staging, production) */

packages/b2c-tooling-sdk/src/config/mapping.ts

@@ -51,6 +51,7 @@ export function mapDwJsonToNormalizedConfig(json: DwJsonConfig): NormalizedConfi
     shortCode: json.shortCode || json['short-code'] || json['scapi-shortcode'],
     instanceName: json.name,
     authMethods: json['auth-methods'],
+    accountManagerHost: json['account-manager-host'],
     mrtProject: json.mrtProject,
     mrtEnvironment: json.mrtEnvironment,
   };

packages/b2c-tooling-sdk/src/config/resolver.ts

@@ -154,10 +154,15 @@ export class ConfigResolver {
     const sourceInfos: ConfigSourceInfo[] = [];
     const baseConfig: NormalizedConfig = {};
 
+    // Create enriched options that will be updated with accumulated config values.
+    // This allows later sources (like plugins) to use values discovered by earlier sources (like dw.json).
+    // CLI-provided options always take precedence over accumulated values.
+    const enrichedOptions: ResolveConfigOptions = {...options};
+
     // Load from each source in order, merging results
     // Earlier sources have higher priority - later sources only fill in missing values
     for (const source of this.sources) {
-      const result = source.load(options);
+      const result = source.load(enrichedOptions);
       if (result) {
         const {config: sourceConfig, location} = result;
         const fields = getPopulatedFields(sourceConfig);
@@ -197,6 +202,12 @@ export class ConfigResolver {
             fields,
             fieldsIgnored: fieldsIgnored.length > 0 ? fieldsIgnored : undefined,
           });
+
+          // Enrich options with accumulated config values for subsequent sources.
+          // Only set if not already provided via CLI options.
+          if (!enrichedOptions.accountManagerHost && baseConfig.accountManagerHost) {
+            enrichedOptions.accountManagerHost = baseConfig.accountManagerHost;
+          }
         }
       }
     }

packages/b2c-tooling-sdk/src/config/types.ts

@@ -127,6 +127,8 @@ export interface ResolveConfigOptions {
   cloudOrigin?: string;
   /** Path to custom MRT credentials file (overrides default ~/.mobify) */
   credentialsFile?: string;
+  /** Account Manager hostname for OAuth (passed to plugins for host-specific config) */
+  accountManagerHost?: string;
 
   /**
    * Custom sources to add BEFORE default sources (higher priority).