Merge remote-tracking branch 'origin/main' into docs/issue-119-policy-flag-asymmetry

# Conflicts:
#	CHANGELOG.md

Author: miya0001

CHANGELOG.md

@@ -8,6 +8,7 @@
 ## [Unreleased]
 
 ### 2026-05-08
+- **Docs**: `admin users create` のヘルプ description / examples で旧フィールド名 `tenantId` を使っていた箇所を `primaryTenantId` に修正。サーバ側 `CreateUserInputSchema` (`.strict()`) は `primaryTenantId` のみを受理しており、ヘルプ通りに書くと `400 Unrecognized key: "tenantId"` で失敗していた。回帰防止としてヘルプ文字列・examples を `primaryTenantId` で検証するユニットテストを追加 (#118, #120)
 - **Docs**: `me api-keys` および `me oauth-clients` で create のフラグが `--policy`、update のフラグが `--policy-id` という命名非対称になっている件について、ヘルプ description と README で明示的に案内するよう修正。`--policy` の説明文に "use --policy-id on update" を、`--policy-id` の説明文に "use --policy on create" を追記。回帰防止としてヘルプ option description を Commander API 経由で検証するユニットテストを追加 (#119, #121)
 
 ## [0.15.0] - 2026-04-30

src/commands/admin/users.ts

@@ -83,10 +83,10 @@ export function registerUsersCommand(parent: Command): void {
         '    "email": "user@example.com",\n' +
         '    "password": "SecurePassword123!",\n' +
         '    "role": "tenant_admin",\n' +
-        '    "tenantId": "<tenant-id>"\n' +
+        '    "primaryTenantId": "<tenant-id>"\n' +
         "  }\n\n" +
         "Roles: super_admin, tenant_admin, user\n" +
-        "tenantId is required for tenant_admin and user roles.",
+        "primaryTenantId is required for tenant_admin and user roles.",
     )
     .action(
       withErrorHandler(async (json: unknown, _opts: unknown, cmd: Command) => {
@@ -104,11 +104,11 @@ export function registerUsersCommand(parent: Command): void {
   addExamples(create, [
     {
       description: "Create a tenant admin",
-      command: `geonic admin users create '{"email":"admin@example.com","password":"SecurePass12345!","role":"tenant_admin","tenantId":"<tenant-id>"}'`,
+      command: `geonic admin users create '{"email":"admin@example.com","password":"SecurePass12345!","role":"tenant_admin","primaryTenantId":"<tenant-id>"}'`,
     },
     {
       description: "Create a user for a tenant",
-      command: `geonic admin users create '{"email":"user@example.com","password":"SecurePass12345!","role":"user","tenantId":"<tenant-id>"}'`,
+      command: `geonic admin users create '{"email":"user@example.com","password":"SecurePass12345!","role":"user","primaryTenantId":"<tenant-id>"}'`,
     },
     {
       description: "Create from a JSON file",

tests/admin-users.test.ts

@@ -38,9 +38,11 @@ vi.mock("../src/commands/help.js", () => ({
   addNotes: vi.fn(),
 }));
 
+import type { Command } from "commander";
 import { createClient, getFormat, outputResponse } from "../src/helpers.js";
 import { parseJsonInput } from "../src/input.js";
 import { printSuccess } from "../src/output.js";
+import { addExamples } from "../src/commands/help.js";
 import { registerUsersCommand } from "../src/commands/admin/users.js";
 
 describe("admin users commands", () => {
@@ -107,6 +109,40 @@ describe("admin users commands", () => {
       expect(outputResponse).toHaveBeenCalled();
       expect(printSuccess).toHaveBeenCalledWith("User created.");
     });
+
+    // #118: server schema accepts only `primaryTenantId`. Help and examples must reflect that.
+    it("references primaryTenantId (not legacy tenantId) in description", () => {
+      const program = makeProgram();
+      const createCmd = program.commands
+        .find((c) => c.name() === "admin")!
+        .commands.find((c) => c.name() === "users")!
+        .commands.find((c) => c.name() === "create")!;
+      const desc = createCmd.description();
+      expect(desc).toContain('"primaryTenantId":');
+      expect(desc).toContain("primaryTenantId is required");
+      expect(desc).not.toContain('"tenantId":');
+      expect(desc).not.toContain("tenantId is required");
+    });
+
+    it("uses primaryTenantId in registered example payloads", () => {
+      makeProgram();
+      const addExamplesMock = vi.mocked(addExamples);
+      const createCalls = addExamplesMock.mock.calls.filter(
+        ([cmd]) => (cmd as Command).name() === "create",
+      );
+      expect(createCalls.length).toBeGreaterThan(0);
+      const examples = createCalls.flatMap(
+        ([, exs]) => exs as ReadonlyArray<{ description: string; command: string }>,
+      );
+      const roleSpecificExamples = examples.filter(
+        (e) => e.command.includes('"role":"tenant_admin"') || e.command.includes('"role":"user"'),
+      );
+      expect(roleSpecificExamples.length).toBeGreaterThan(0);
+      for (const ex of roleSpecificExamples) {
+        expect(ex.command).toContain('"primaryTenantId":');
+        expect(ex.command).not.toContain('"tenantId":');
+      }
+    });
   });
 
   describe("users update", () => {