slas should create tenant if doesn't exist

Author: clavery

docs/cli/slas.md

@@ -102,17 +102,18 @@ b2c slas client create [CLIENTID] --tenant-id <TENANT_ID> --channels <CHANNELS>
 
 ### Flags
 
-| Flag | Description | Required |
-|------|-------------|----------|
-| `--tenant-id` | SLAS tenant ID (organization ID) | Yes |
-| `--channels` | Site IDs/channels (comma-separated) | Yes |
-| `--redirect-uri` | Redirect URIs (comma-separated) | Yes |
-| `--name` | Display name for the client | No |
-| `--scopes` | OAuth scopes for the client (comma-separated) | No |
-| `--default-scopes` | Use default shopper scopes | No |
-| `--callback-uri` | Callback URIs for passwordless login | No |
-| `--secret` | Client secret (generated if omitted) | No |
-| `--public` | Create a public client (default is private) | No |
+| Flag | Description | Default |
+|------|-------------|---------|
+| `--tenant-id` | SLAS tenant ID (organization ID) | Required |
+| `--channels` | Site IDs/channels (comma-separated) | Required |
+| `--redirect-uri` | Redirect URIs (comma-separated) | Required |
+| `--name` | Display name for the client | Auto-generated |
+| `--scopes` | OAuth scopes for the client (comma-separated) | |
+| `--default-scopes` | Use default shopper scopes | `false` |
+| `--callback-uri` | Callback URIs for passwordless login | |
+| `--secret` | Client secret (generated if omitted) | Auto-generated |
+| `--public` | Create a public client (default is private) | `false` |
+| `--[no-]create-tenant` | Automatically create tenant if it doesn't exist | `true` |
 
 ### Examples
 
@@ -150,6 +151,7 @@ b2c slas client create --tenant-id abcd_123 \
 - If `--secret` is not provided for a private client, one will be generated
 - The generated secret is only shown once during creation
 - Use `--default-scopes` for common shopper API access scopes
+- By default, the tenant is automatically created if it doesn't exist. Use `--no-create-tenant` to disable this behavior if you prefer to manage tenants separately
 
 ---
 

packages/b2c-cli/src/commands/slas/client/create.ts

@@ -98,6 +98,11 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
       description: 'Create a public client (default is private)',
       default: false,
     }),
+    'create-tenant': Flags.boolean({
+      description: 'Automatically create tenant if it does not exist',
+      default: true,
+      allowNo: true,
+    }),
   };
 
   async run(): Promise<ClientOutput> {
@@ -113,6 +118,7 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
       'callback-uri': callbackUri,
       secret,
       public: isPublic,
+      'create-tenant': createTenant,
     } = this.flags;
 
     // Validate that either --scopes or --default-scopes is provided
@@ -140,6 +146,11 @@ export default class SlasClientCreate extends SlasClientCommand<typeof SlasClien
 
     const slasClient = this.getSlasClient();
 
+    // Ensure tenant exists before creating client (if enabled)
+    if (createTenant) {
+      await this.ensureTenantExists(slasClient, tenantId);
+    }
+
     // Build body - secret should only be included for private clients
     const body: Record<string, unknown> = {
       clientId,

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

@@ -126,4 +126,71 @@ export abstract class SlasClientCommand<T extends typeof Command> extends OAuthC
     const oauthStrategy = this.getOAuthStrategy();
     return createSlasClient({shortCode}, oauthStrategy);
   }
+
+  /**
+   * Ensure tenant exists, creating it if necessary.
+   * This is required before creating SLAS clients.
+   */
+  protected async ensureTenantExists(slasClient: SlasClient, tenantId: string): Promise<void> {
+    // Try to get the tenant first
+    const {error, response} = await slasClient.GET('/tenants/{tenantId}', {
+      params: {
+        path: {tenantId},
+      },
+    });
+
+    // If tenant exists, we're done
+    if (!error) {
+      return;
+    }
+
+    // Check if this is a "tenant not found" error (SLAS returns 400 with TenantNotFoundException)
+    const isTenantNotFound =
+      response.status === 404 ||
+      (response.status === 400 &&
+        typeof error === 'object' &&
+        error !== null &&
+        'exception_name' in error &&
+        (error as {exception_name?: string}).exception_name === 'TenantNotFoundException');
+
+    // If it's not a tenant-not-found error, something else went wrong
+    if (!isTenantNotFound) {
+      this.error(
+        t('commands.slas.client.create.tenantError', 'Failed to check tenant: {{message}}', {
+          message: formatApiError(error),
+        }),
+      );
+    }
+
+    // Tenant doesn't exist, create it with placeholder values
+    if (!this.jsonEnabled()) {
+      this.log(t('commands.slas.client.create.creatingTenant', 'Creating SLAS tenant {{tenantId}}...', {tenantId}));
+    }
+
+    const {error: createError} = await slasClient.PUT('/tenants/{tenantId}', {
+      params: {
+        path: {tenantId},
+      },
+      body: {
+        tenantId,
+        merchantName: 'B2C CLI Tenant',
+        description: 'Auto-created by b2c-cli',
+        contact: 'B2C CLI',
+        emailAddress: 'noreply@example.com',
+        phoneNo: '+1 000-000-0000',
+      },
+    });
+
+    if (createError) {
+      this.error(
+        t('commands.slas.client.create.tenantCreateError', 'Failed to create tenant: {{message}}', {
+          message: formatApiError(createError),
+        }),
+      );
+    }
+
+    if (!this.jsonEnabled()) {
+      this.log(t('commands.slas.client.create.tenantCreated', 'SLAS tenant created successfully.'));
+    }
+  }
 }

plugins/b2c-cli/skills/b2c-slas/SKILL.md

@@ -29,10 +29,24 @@ b2c slas client get --tenant-id abcd_123 --client-id my-client-id
 ### Create SLAS Client
 
 ```bash
-# create a new SLAS client
-b2c slas client create --tenant-id abcd_123
+# create a new SLAS client with default scopes (auto-generates UUID client ID)
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback
+
+# create with a specific client ID and custom scopes
+b2c slas client create my-client-id --tenant-id abcd_123 --channels RefArch --scopes sfcc.shopper-products,sfcc.shopper-search --redirect-uri http://localhost:3000/callback
+
+# create a public client
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback --public
+
+# create client without auto-creating tenant (if you manage tenants separately)
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback --no-create-tenant
+
+# output as JSON (useful for capturing the generated secret)
+b2c slas client create --tenant-id abcd_123 --channels RefArch --default-scopes --redirect-uri http://localhost:3000/callback --json
 ```
 
+Note: By default, the tenant is automatically created if it doesn't exist.
+
 ### Update SLAS Client
 
 ```bash