@geolonia/geonicdb-cli 0.8.0 → 0.9.0

package/dist/index.js

@@ -186,6 +186,15 @@ function printInfo(message) {
 function printWarning(message) {
   console.error(chalk.yellow(message));
 }
+function printApiKeyBox(key) {
+  const border = "\u2500".repeat(key.length + 4);
+  console.error("");
+  console.error(chalk.green(`  \u250C${border}\u2510`));
+  console.error(chalk.green(`  \u2502  ${chalk.bold(key)}  \u2502`));
+  console.error(chalk.green(`  \u2514${border}\u2518`));
+  console.error("");
+  console.error(chalk.yellow("\u26A0 \u3053\u306E API \u30AD\u30FC\u5024\u3092\u5B89\u5168\u306B\u4FDD\u5B58\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u4E8C\u5EA6\u3068\u8868\u793A\u3055\u308C\u307E\u305B\u3093\u3002"));
+}
 function printCount(count) {
   console.log(chalk.dim(`Count: ${count}`));
 }
@@ -1477,6 +1486,45 @@ function addMeOAuthClientsSubcommand(me) {
 }
 
 // src/commands/me-api-keys.ts
+function cleanApiKeyData(data) {
+  if (Array.isArray(data)) return data.map(cleanApiKeyData);
+  if (typeof data !== "object" || data === null) return data;
+  const obj = { ...data };
+  if (obj.key === "******") delete obj.key;
+  return obj;
+}
+function handleSaveKey(data, cmd) {
+  const globalOpts = resolveOptions(cmd);
+  const key = data.key;
+  if (!key) {
+    printError("Response missing key. API key was created, but it could not be saved.");
+    process.exitCode = 1;
+    return false;
+  }
+  try {
+    const config = loadConfig(globalOpts.profile);
+    config.apiKey = key;
+    saveConfig(config, globalOpts.profile);
+    console.error("API key saved to config. X-Api-Key header will be sent automatically.");
+    return true;
+  } catch (err) {
+    printError(`Failed to save API key to config: ${err instanceof Error ? err.message : String(err)}`);
+    printApiKeyBox(key);
+    process.exitCode = 1;
+    return false;
+  }
+}
+function showKeyResult(data, save, cmd) {
+  const key = data.key;
+  if (!key) {
+    printError("Response missing key. The new API key value was not returned.");
+    process.exitCode = 1;
+    return false;
+  }
+  if (save) return handleSaveKey(data, cmd);
+  printApiKeyBox(key);
+  return true;
+}
 function addMeApiKeysSubcommand(me) {
   const apiKeys = me.command("api-keys").description("Manage your API keys");
   const list = apiKeys.command("list").description("List your API keys").action(
@@ -1484,7 +1532,9 @@ function addMeApiKeysSubcommand(me) {
       const client = createClient(cmd);
       const format = getFormat(cmd);
       const response = await client.rawRequest("GET", "/me/api-keys");
+      response.data = cleanApiKeyData(response.data);
       outputResponse(response, format);
+      console.error("\u203B API \u30AD\u30FC\u5024\u306F\u4F5C\u6210\u6642 (create) \u307E\u305F\u306F\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u6642 (refresh) \u306B\u306E\u307F\u8868\u793A\u3055\u308C\u307E\u3059\u3002");
     })
   );
   addExamples(list, [
@@ -1540,24 +1590,9 @@ function addMeApiKeysSubcommand(me) {
       const format = getFormat(cmd);
       const response = await client.rawRequest("POST", "/me/api-keys", { body });
       const data = response.data;
-      if (opts.save) {
-        const globalOpts = resolveOptions(cmd);
-        const key = data.key;
-        if (!key) {
-          printError("Response missing key. API key was created, but it could not be saved.");
-          outputResponse(response, format);
-          process.exitCode = 1;
-          return;
-        }
-        const config = loadConfig(globalOpts.profile);
-        config.apiKey = key;
-        saveConfig(config, globalOpts.profile);
-        console.error("API key saved to config. X-Api-Key header will be sent automatically.");
-      } else {
-        printWarning("Save the API key now \u2014 it will not be shown again. Use --save to store it automatically.");
-      }
+      const ok = showKeyResult(data, !!opts.save, cmd);
       outputResponse(response, format);
-      console.error("API key created.");
+      if (ok) console.error("API key created.");
     })
   );
   addNotes(create, [
@@ -1586,6 +1621,35 @@ function addMeApiKeysSubcommand(me) {
       command: "geonic me api-keys create --name my-app --dpop-required"
     }
   ]);
+  const refresh = apiKeys.command("refresh <keyId>").description("Refresh (rotate) an API key \u2014 generates a new key value").option("--save", "Save the new API key to config for automatic use").action(
+    withErrorHandler(async (keyId, _opts, cmd) => {
+      const opts = cmd.opts();
+      const client = createClient(cmd);
+      const format = getFormat(cmd);
+      const response = await client.rawRequest(
+        "POST",
+        `/me/api-keys/${encodeURIComponent(String(keyId))}/refresh`
+      );
+      const data = response.data;
+      const ok = showKeyResult(data, !!opts.save, cmd);
+      outputResponse(response, format);
+      if (ok) console.error("API key refreshed.");
+    })
+  );
+  addNotes(refresh, [
+    "Refreshing generates a new key value while keeping keyId, name, and policy settings.",
+    "The previous key value is immediately invalidated."
+  ]);
+  addExamples(refresh, [
+    {
+      description: "Refresh an API key",
+      command: "geonic me api-keys refresh <key-id>"
+    },
+    {
+      description: "Refresh and save new key to config",
+      command: "geonic me api-keys refresh <key-id> --save"
+    }
+  ]);
   const update = apiKeys.command("update <keyId> [json]").description("Update an API key").option("--name <name>", "Key name").option("--policy-id <policyId>", "Policy ID to attach (use 'null' to unbind)").option("--origins <origins>", "Allowed origins (comma-separated)").option("--rate-limit <n>", "Rate limit (requests per minute)").option("--dpop-required", "Require DPoP token binding").option("--no-dpop-required", "Disable DPoP requirement").option("--active", "Activate the API key").option("--inactive", "Deactivate the API key").action(
     withErrorHandler(async (keyId, json, _opts, cmd) => {
       const opts = cmd.opts();
@@ -1886,10 +1950,10 @@ function createLoginCommand() {
         process.exit(1);
       }
       const availableTenants = data.availableTenants;
-      const currentTenantId = data.tenantId;
+      let finalTenantId = data.tenantId;
       if (availableTenants && availableTenants.length > 1 && !loginOpts.tenantId) {
-        const selectedTenantId = await promptTenantSelection(availableTenants, currentTenantId);
-        if (selectedTenantId && selectedTenantId !== currentTenantId) {
+        const selectedTenantId = await promptTenantSelection(availableTenants, finalTenantId);
+        if (selectedTenantId && selectedTenantId !== finalTenantId) {
           const reloginResponse = await client.rawRequest("POST", "/auth/login", {
             body: { email, password, tenantId: selectedTenantId },
             skipTenantHeader: true
@@ -1902,6 +1966,7 @@ function createLoginCommand() {
           }
           token = newToken;
           refreshToken = reloginData.refreshToken;
+          finalTenantId = selectedTenantId;
         }
       }
       const config = loadConfig(globalOpts.profile);
@@ -1911,6 +1976,11 @@ function createLoginCommand() {
       } else {
         delete config.refreshToken;
       }
+      if (finalTenantId) {
+        config.service = finalTenantId;
+      } else {
+        delete config.service;
+      }
       saveConfig(config, globalOpts.profile);
       printSuccess("Login successful. Token saved to config.");
     })
@@ -3941,6 +4011,13 @@ function registerCaddeCommand(parent) {
 }
 
 // src/commands/admin/api-keys.ts
+function cleanApiKeyData2(data) {
+  if (Array.isArray(data)) return data.map(cleanApiKeyData2);
+  if (typeof data !== "object" || data === null) return data;
+  const obj = { ...data };
+  if (obj.key === "******") delete obj.key;
+  return obj;
+}
 function validateOrigins(body, opts) {
   if (opts.origins !== void 0) {
     const origins = String(opts.origins).split(",").map((s) => s.trim()).filter(Boolean);
@@ -3979,6 +4056,38 @@ function buildBodyFromFlags(opts) {
   if (opts.tenantId) payload.tenantId = opts.tenantId;
   return payload;
 }
+function handleSaveKey2(data, cmd) {
+  const globalOpts = resolveOptions(cmd);
+  const key = data.key;
+  if (!key) {
+    printError("Response missing key. API key was created, but it could not be saved.");
+    process.exitCode = 1;
+    return false;
+  }
+  try {
+    const config = loadConfig(globalOpts.profile);
+    config.apiKey = key;
+    saveConfig(config, globalOpts.profile);
+    console.error("API key saved to config. X-Api-Key header will be sent automatically.");
+    return true;
+  } catch (err) {
+    printError(`Failed to save API key to config: ${err instanceof Error ? err.message : String(err)}`);
+    printApiKeyBox(key);
+    process.exitCode = 1;
+    return false;
+  }
+}
+function showKeyResult2(data, save, cmd) {
+  const key = data.key;
+  if (!key) {
+    printError("Response missing key. The new API key value was not returned.");
+    process.exitCode = 1;
+    return false;
+  }
+  if (save) return handleSaveKey2(data, cmd);
+  printApiKeyBox(key);
+  return true;
+}
 function registerApiKeysCommand(parent) {
   const apiKeys = parent.command("api-keys").description("Manage API keys");
   const list = apiKeys.command("list").description("List all API keys").option("--tenant-id <id>", "Filter by tenant ID").action(
@@ -3991,7 +4100,9 @@ function registerApiKeysCommand(parent) {
       const response = await client.rawRequest("GET", "/admin/api-keys", {
         params
       });
+      response.data = cleanApiKeyData2(response.data);
       outputResponse(response, format);
+      console.error("\u203B API \u30AD\u30FC\u5024\u306F\u4F5C\u6210\u6642 (create) \u307E\u305F\u306F\u30EA\u30D5\u30EC\u30C3\u30B7\u30E5\u6642 (refresh) \u306B\u306E\u307F\u8868\u793A\u3055\u308C\u307E\u3059\u3002");
     })
   );
   addExamples(list, [
@@ -4012,6 +4123,7 @@ function registerApiKeysCommand(parent) {
         "GET",
         `/admin/api-keys/${encodeURIComponent(String(keyId))}`
       );
+      response.data = cleanApiKeyData2(response.data);
       outputResponse(response, format);
     })
   );
@@ -4040,24 +4152,9 @@ function registerApiKeysCommand(parent) {
         body
       });
       const data = response.data;
-      if (opts.save) {
-        const globalOpts = resolveOptions(cmd);
-        const key = data.key;
-        if (!key) {
-          printError("Response missing key. API key was created, but it could not be saved.");
-          outputResponse(response, format);
-          process.exitCode = 1;
-          return;
-        }
-        const config = loadConfig(globalOpts.profile);
-        config.apiKey = key;
-        saveConfig(config, globalOpts.profile);
-        console.error("API key saved to config. X-Api-Key header will be sent automatically.");
-      } else {
-        printWarning("Save the API key now \u2014 it will not be shown again. Use --save to store it automatically.");
-      }
+      const ok = showKeyResult2(data, !!opts.save, cmd);
       outputResponse(response, format);
-      console.error("API key created.");
+      if (ok) console.error("API key created.");
     })
   );
   addNotes(create, [
@@ -4078,6 +4175,35 @@ function registerApiKeysCommand(parent) {
       command: "geonic admin api-keys create @key.json --save"
     }
   ]);
+  const refresh = apiKeys.command("refresh <keyId>").description("Refresh (rotate) an API key \u2014 generates a new key value").option("--save", "Save the new API key to profile config").action(
+    withErrorHandler(async (keyId, _opts, cmd) => {
+      const opts = cmd.opts();
+      const client = createClient(cmd);
+      const format = getFormat(cmd);
+      const response = await client.rawRequest(
+        "POST",
+        `/admin/api-keys/${encodeURIComponent(String(keyId))}/refresh`
+      );
+      const data = response.data;
+      const ok = showKeyResult2(data, !!opts.save, cmd);
+      outputResponse(response, format);
+      if (ok) console.error("API key refreshed.");
+    })
+  );
+  addNotes(refresh, [
+    "Refreshing generates a new key value while keeping keyId, name, and policy settings.",
+    "The previous key value is immediately invalidated."
+  ]);
+  addExamples(refresh, [
+    {
+      description: "Refresh an API key",
+      command: "geonic admin api-keys refresh <key-id>"
+    },
+    {
+      description: "Refresh and save new key to config",
+      command: "geonic admin api-keys refresh <key-id> --save"
+    }
+  ]);
   const update = apiKeys.command("update <keyId> [json]").description("Update an API key").option("--name <name>", "Key name").option("--policy <policyId>", "Policy ID to attach").option("--origins <origins>", "Comma-separated origins").option("--rate-limit <n>", "Rate limit per minute").option("--dpop-required", "Require DPoP token binding").option("--no-dpop-required", "Disable DPoP token binding").action(
     withErrorHandler(
       async (keyId, json, _opts, cmd) => {