Skip to content

Commit 25697d2

Browse files
authored
fix: API キーコマンドのヘルプに表示されるスコープ一覧を実際に使用可能な6スコープに修正 (#74)
1 parent f832141 commit 25697d2

18 files changed

Lines changed: 32 additions & 6 deletions

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
## [Unreleased]
99

10+
### 2026-03-17
11+
- **Fix**: API キーコマンド (`me api-keys`, `admin api-keys`) のヘルプで表示されるスコープ一覧を、API キーで実際に使用可能な6スコープに修正 (#74)
12+
1013
## [0.6.3] - 2026-03-17
1114

1215
### 2026-03-17

src/commands/admin/api-keys.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { loadConfig, saveConfig } from "../../config.js";
44
import { parseJsonInput } from "../../input.js";
55
import { printError, printWarning } from "../../output.js";
66
import { addExamples, addNotes } from "../help.js";
7-
import { SCOPES_HELP_NOTES } from "../../helpers.js";
7+
import { API_KEY_SCOPES_HELP_NOTES } from "../../helpers.js";
88

99
function validateOrigins(body: unknown, opts: Record<string, unknown>): void {
1010
// Validate origins if provided via flags
@@ -174,7 +174,7 @@ export function registerApiKeysCommand(parent: Command): void {
174174
}),
175175
);
176176

177-
addNotes(create, SCOPES_HELP_NOTES);
177+
addNotes(create, API_KEY_SCOPES_HELP_NOTES);
178178

179179
addExamples(create, [
180180
{
@@ -240,7 +240,7 @@ export function registerApiKeysCommand(parent: Command): void {
240240
),
241241
);
242242

243-
addNotes(update, SCOPES_HELP_NOTES);
243+
addNotes(update, API_KEY_SCOPES_HELP_NOTES);
244244

245245
addExamples(update, [
246246
{

src/commands/me-api-keys.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { loadConfig, saveConfig } from "../config.js";
44
import { parseJsonInput } from "../input.js";
55
import { printError, printWarning } from "../output.js";
66
import { addExamples, addNotes } from "./help.js";
7-
import { SCOPES_HELP_NOTES } from "../helpers.js";
7+
import { API_KEY_SCOPES_HELP_NOTES } from "../helpers.js";
88

99
export function addMeApiKeysSubcommand(me: Command): void {
1010
const apiKeys = me
@@ -128,7 +128,7 @@ export function addMeApiKeysSubcommand(me: Command): void {
128128
}),
129129
);
130130

131-
addNotes(create, SCOPES_HELP_NOTES);
131+
addNotes(create, API_KEY_SCOPES_HELP_NOTES);
132132

133133
addExamples(create, [
134134
{

src/helpers.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { printError, printOutput, printCount } from "./output.js";
55
import type { ClientResponse, GlobalOptions, OutputFormat } from "./types.js";
66

77
/**
8-
* Valid scope values for --scopes option help text.
8+
* Valid scope values for --scopes option help text (OAuth clients).
99
*/
1010
export const SCOPES_HELP_NOTES = [
1111
"Valid scopes:",
@@ -18,6 +18,15 @@ export const SCOPES_HELP_NOTES = [
1818
"write:X implies read:X. admin:X implies both read:X and write:X.",
1919
];
2020

21+
/**
22+
* Valid scope values for --scopes option help text (API keys).
23+
*/
24+
export const API_KEY_SCOPES_HELP_NOTES = [
25+
"Valid scopes:",
26+
" read:entities, write:entities, read:subscriptions, write:subscriptions,",
27+
" read:registrations, write:registrations",
28+
];
29+
2130
/**
2231
* Resolve merged options from config + CLI flags.
2332
*/

tests/admin-api-keys.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vi.mock("../src/helpers.js", () => ({
88
outputResponse: vi.fn(),
99
withErrorHandler: (fn: (...args: unknown[]) => unknown) => fn,
1010
SCOPES_HELP_NOTES: [],
11+
API_KEY_SCOPES_HELP_NOTES: [],
1112
resolveOptions: vi.fn().mockReturnValue({ profile: "default" }),
1213
}));
1314

tests/admin-oauth-clients.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vi.mock("../src/helpers.js", () => ({
88
outputResponse: vi.fn(),
99
withErrorHandler: (fn: (...args: unknown[]) => unknown) => fn,
1010
SCOPES_HELP_NOTES: [],
11+
API_KEY_SCOPES_HELP_NOTES: [],
1112
resolveOptions: vi.fn(),
1213
}));
1314

tests/admin-policies.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vi.mock("../src/helpers.js", () => ({
88
outputResponse: vi.fn(),
99
withErrorHandler: (fn: (...args: unknown[]) => unknown) => fn,
1010
SCOPES_HELP_NOTES: [],
11+
API_KEY_SCOPES_HELP_NOTES: [],
1112
resolveOptions: vi.fn(),
1213
}));
1314

tests/admin-tenants.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vi.mock("../src/helpers.js", () => ({
88
outputResponse: vi.fn(),
99
withErrorHandler: (fn: (...args: unknown[]) => unknown) => fn,
1010
SCOPES_HELP_NOTES: [],
11+
API_KEY_SCOPES_HELP_NOTES: [],
1112
resolveOptions: vi.fn(),
1213
}));
1314

tests/admin-users.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vi.mock("../src/helpers.js", () => ({
88
outputResponse: vi.fn(),
99
withErrorHandler: (fn: (...args: unknown[]) => unknown) => fn,
1010
SCOPES_HELP_NOTES: [],
11+
API_KEY_SCOPES_HELP_NOTES: [],
1112
resolveOptions: vi.fn(),
1213
}));
1314

tests/auth.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ vi.mock("../src/helpers.js", () => ({
88
outputResponse: vi.fn(),
99
withErrorHandler: (fn: (...args: unknown[]) => unknown) => fn,
1010
SCOPES_HELP_NOTES: [],
11+
API_KEY_SCOPES_HELP_NOTES: [],
1112
resolveOptions: vi.fn(),
1213
}));
1314

0 commit comments

Comments
 (0)