apiblaze 0.16.0 → 0.17.1

package/dist/index.js

@@ -460,6 +460,7 @@ var init_admin = __esm({
 // src/lib/tenant-create.ts
 var tenant_create_exports = {};
 __export(tenant_create_exports, {
+  addApiblazeHostedLogin: () => addApiblazeHostedLogin,
   createTenantInteractive: () => createTenantInteractive
 });
 async function createTenantRow(teamId) {
@@ -490,23 +491,22 @@ async function createTenantRow(teamId) {
     }
   }
 }
-async function setUpLogin(teamId, tenant2) {
+async function addApiblazeHostedLogin(teamId, tenant2, opts = {}) {
   const { default: inquirer2 } = await import("inquirer");
   const base = `/teams/${encodeURIComponent(teamId)}/tenants/${encodeURIComponent(tenant2)}`;
   const { provider } = await inquirer2.prompt([{
     type: "list",
     name: "provider",
-    message: "How do people log in?",
+    message: "Which login provider?",
     pageSize: 10,
     choices: [
       ...PROVIDERS.map((p) => ({ name: p.label, value: p.id })),
-      new inquirer2.Separator(),
-      { name: import_chalk22.default.dim("Skip for now \u2014 set up a login method later"), value: null }
+      ...opts.allowSkip ? [new inquirer2.Separator(), { name: import_chalk22.default.dim("Skip for now \u2014 set up a login method later"), value: null }] : []
     ]
   }]);
   if (!provider) {
     console.log(import_chalk22.default.dim("  No login method yet \u2014 add one later under Login methods."));
-    return;
+    return false;
   }
   const opt = PROVIDERS.find((p) => p.id === provider);
   let providerBody;
@@ -542,8 +542,9 @@ async function setUpLogin(teamId, tenant2) {
     const clientId = client?.clientId ?? client?.client_id;
     await admin({ method: "POST", path: `${base}/app-clients/${encodeURIComponent(clientId)}/providers`, body: providerBody, summary: `Add ${provider} provider` });
     spinner.succeed(opt.own ? `${opt.label} login is ready.` : "APIblaze-hosted GitHub login is ready.");
+    return true;
   } catch (err) {
-    spinner.fail("Login setup failed (the tenant was still created).");
+    spinner.fail("Login setup failed.");
     throw err;
   }
 }
@@ -562,7 +563,7 @@ async function createTenantInteractive(teamId) {
     });
     console.log(import_chalk22.default.green("  Users & groups enabled."));
   }
-  await setUpLogin(teamId, tenant2);
+  await addApiblazeHostedLogin(teamId, tenant2, { allowSkip: true });
   return tenant2;
 }
 var import_chalk22, import_ora8, PROVIDERS, DEFAULT_SCOPES;
@@ -686,7 +687,7 @@ var import_commander = require("commander");
 var import_chalk35 = __toESM(require("chalk"));
 
 // package.json
-var version = "0.16.0";
+var version = "0.17.1";
 
 // src/index.ts
 init_types();
@@ -3065,6 +3066,8 @@ Tenant ${tenant2}`));
     const nEmails = (emails?.admin_emails ?? []).length;
     const nIssuers = (issuers?.external_issuers ?? []).length;
     const nClients = Array.isArray(clients) ? clients.length : 0;
+    const nOpaque = opaque?.opaque?.endpoint ? 1 : 0;
+    const nLogin = nClients + nIssuers + nOpaque;
     const onOff = (b) => b ? import_chalk25.default.green("on") : import_chalk25.default.dim("off");
     const { pick: pick2 } = await inquirer2.prompt([{
       type: "list",
@@ -3072,21 +3075,19 @@ Tenant ${tenant2}`));
       message: `Tenant ${tenant2}:`,
       pageSize: 12,
       choices: [
-        { name: `Login methods (${nClients})  ${import_chalk25.default.dim("how your consumers sign in \u2014 providers live inside")}`, value: "clients" },
+        { name: `Login methods (${nLogin})  ${import_chalk25.default.dim("how your consumers sign in")}`, value: "login" },
         { name: `Users & groups: ${onOff(iam?.iam_enabled)}  ${import_chalk25.default.dim(`identity & key management (${tenant2}.iam.apiblaze.com)`)}`, value: "iam" },
-        { name: `Your own hosted login \u2014 JWT (${nIssuers})  ${import_chalk25.default.dim("trust tokens your own identity provider issues")}`, value: "issuers" },
         { name: `Portal admins (${nEmails})  ${import_chalk25.default.dim("emails allowed to administer this tenant's portal")}`, value: "emails" },
         new inquirer2.Separator(import_chalk25.default.dim("  Settings")),
         { name: `CORS: ${cors?.cors ? import_chalk25.default.cyan(JSON.stringify(cors.cors)) : import_chalk25.default.dim("(unset)")}  ${import_chalk25.default.dim("browser origins allowed to call this tenant")}`, value: "cors" },
-        { name: `Opaque-token login (advanced): ${opaque?.opaque?.endpoint ? import_chalk25.default.cyan(opaque.opaque.endpoint) : import_chalk25.default.dim("(unset)")}`, value: "opaque" },
         { name: "\u2190 Back", value: "back" }
       ]
     }]);
     switch (pick2) {
       case "back":
         return;
-      case "clients":
-        await clientsMenu(teamId, tenant2, base);
+      case "login":
+        await loginMethodsMenu(teamId, tenant2, base);
         break;
       case "iam": {
         const { v } = await inquirer2.prompt([{ type: "confirm", name: "v", message: "Enable Users & groups?", default: !!iam?.iam_enabled }]);
@@ -3114,38 +3115,88 @@ Tenant ${tenant2}`));
       case "emails":
         await emailsMenu(base, emails?.admin_emails ?? []);
         break;
-      case "issuers":
-        await issuersMenu(base, issuers?.external_issuers ?? []);
-        break;
-      case "opaque": {
-        const cur = opaque?.opaque;
-        const { mode } = await inquirer2.prompt([{
-          type: "list",
-          name: "mode",
-          message: "Opaque-token validator:",
-          choices: [
-            { name: cur ? "Replace it" : "Set one up", value: "set" },
-            ...cur ? [{ name: "Clear it", value: "clear" }] : [],
-            { name: "\u2190 Back", value: "back" }
-          ]
-        }]);
-        if (mode === "back") break;
-        if (mode === "clear") {
-          await admin({ method: "PUT", path: `${base}/opaque`, body: { opaque: null }, summary: "Clear opaque validator" });
-          console.log(import_chalk25.default.green("  Cleared."));
-          break;
-        }
-        const a = await inquirer2.prompt([
-          { type: "input", name: "endpoint", message: "Introspection endpoint (https):", default: cur?.endpoint, validate: (s) => s.startsWith("https://") || "must be https" },
-          { type: "list", name: "method", message: "HTTP method:", choices: ["GET", "POST"], default: cur?.method ?? "GET" }
-        ]);
-        await admin({ method: "PUT", path: `${base}/opaque`, body: { opaque: { endpoint: a.endpoint, method: a.method } }, summary: "Set opaque validator" });
-        console.log(import_chalk25.default.green("  Opaque validator set."));
-        break;
-      }
     }
   }
 }
+async function loginMethodsMenu(teamId, tenant2, base) {
+  const { default: inquirer2 } = await import("inquirer");
+  for (; ; ) {
+    const spinner = (0, import_ora11.default)("Loading login methods...").start();
+    const [rawClients, rawIssuers, rawOpaque] = await Promise.all([
+      admin({ method: "GET", path: `${base}/app-clients`, summary: "List APIblaze-hosted logins" }).catch(() => []),
+      admin({ method: "GET", path: `${base}/external-issuers`, summary: "List your-own-JWT logins" }).catch(() => null),
+      admin({ method: "GET", path: `${base}/opaque`, summary: "Read opaque login" }).catch(() => null)
+    ]).finally(() => spinner.stop());
+    const appClients = Array.isArray(rawClients) ? rawClients : [];
+    const issuers = rawIssuers?.external_issuers ?? [];
+    const opaque = rawOpaque?.opaque ?? null;
+    const choices = [];
+    for (const c of appClients) {
+      const nP = (c.providers ?? []).length || c.providers_count || 0;
+      choices.push({ name: `${import_chalk25.default.cyan("APIblaze-hosted")}  ${import_chalk25.default.bold(c.name ?? c.clientId)}  ${import_chalk25.default.dim(`${c.clientId}${nP ? ` \xB7 ${nP} provider${nP === 1 ? "" : "s"}` : import_chalk25.default.yellow(" \xB7 needs a provider")}`)}`, value: { kind: "client", item: c } });
+    }
+    for (const i of issuers) {
+      choices.push({ name: `${import_chalk25.default.cyan("Your own \u2014 JWT ")}  ${import_chalk25.default.bold(i.iss)}  ${import_chalk25.default.dim(`aud=${i.aud}`)}`, value: { kind: "issuer", item: i } });
+    }
+    if (opaque?.endpoint) {
+      choices.push({ name: `${import_chalk25.default.cyan("Your own \u2014 opaque")}  ${import_chalk25.default.bold(opaque.endpoint)}`, value: { kind: "opaque", item: opaque } });
+    }
+    if (!choices.length) console.log(import_chalk25.default.dim("\n  No login methods yet \u2014 consumers cannot sign in until you add one."));
+    const { pick: pick2 } = await inquirer2.prompt([{
+      type: "list",
+      name: "pick",
+      message: `Login methods for ${tenant2}:`,
+      pageSize: 15,
+      choices: [
+        ...choices,
+        new inquirer2.Separator(),
+        { name: "\uFF0B Add a login method\u2026", value: { kind: "add" } },
+        { name: "\u2190 Back", value: { kind: "back" } }
+      ]
+    }]);
+    if (pick2.kind === "back") return;
+    if (pick2.kind === "add") {
+      await addLoginMethod(teamId, tenant2, base);
+      continue;
+    }
+    if (pick2.kind === "client") {
+      await clientHome(base, pick2.item);
+      continue;
+    }
+    if (pick2.kind === "issuer") {
+      await issuerHome(base, pick2.item);
+      continue;
+    }
+    if (pick2.kind === "opaque") {
+      await opaqueHome(base, pick2.item);
+      continue;
+    }
+  }
+}
+async function addLoginMethod(teamId, tenant2, base) {
+  const { default: inquirer2 } = await import("inquirer");
+  const { kind } = await inquirer2.prompt([{
+    type: "list",
+    name: "kind",
+    message: "How do people log in?",
+    pageSize: 8,
+    choices: [
+      { name: `APIblaze hosted login page  ${import_chalk25.default.dim("we host login; pick a provider (GitHub/Google/\u2026) \u2014 easiest")}`, value: "apiblaze" },
+      { name: `Your own hosted login \u2014 JWT  ${import_chalk25.default.dim("your identity provider issues JWTs; we trust them")}`, value: "jwt" },
+      { name: `Your own login \u2014 opaque token  ${import_chalk25.default.dim("we validate your opaque tokens via an introspection endpoint")}`, value: "opaque" },
+      { name: "\u2190 Back", value: null }
+    ]
+  }]);
+  if (!kind) return;
+  if (kind === "apiblaze") {
+    const { addApiblazeHostedLogin: addApiblazeHostedLogin2 } = await Promise.resolve().then(() => (init_tenant_create(), tenant_create_exports));
+    await addApiblazeHostedLogin2(teamId, tenant2);
+  } else if (kind === "jwt") {
+    await addIssuer(base);
+  } else {
+    await setOpaque(base, null);
+  }
+}
 function safeJson(s) {
   try {
     return JSON.parse(s);
@@ -3185,98 +3236,84 @@ async function emailsMenu(base, emails) {
     console.log(import_chalk25.default.green(`  ${e} removed.`));
   }
 }
-async function issuersMenu(base, issuers) {
+async function addIssuer(base) {
   const { default: inquirer2 } = await import("inquirer");
-  console.log();
-  if (!issuers.length) console.log(import_chalk25.default.dim("  No external issuers \u2014 consumers use APIblaze-issued tokens."));
-  for (const i of issuers) console.log(`  ${import_chalk25.default.bold(i.iss)}  aud=${i.aud}  ${import_chalk25.default.dim(i.sub_semantics ?? "")}`);
+  const a = await inquirer2.prompt([
+    { type: "input", name: "iss", message: "Issuer URL (iss):", validate: (s) => !!s.trim() || "required" },
+    { type: "input", name: "aud", message: "Audience (aud):", validate: (s) => !!s.trim() || "required" },
+    { type: "input", name: "jwks", message: "JWKS URL (empty = derive from issuer):" },
+    { type: "list", name: "sem", message: "Where is the end-user id?", choices: [
+      { name: "The token sub IS the end user (tenant-owned)", value: "tenant_owned" },
+      { name: "Extract it from a claim\u2026", value: "extract_from_claim" }
+    ] }
+  ]);
+  const claim = a.sem === "extract_from_claim" ? (await inquirer2.prompt([{ type: "input", name: "c", message: "Claim name:", validate: (s) => !!s.trim() || "required" }])).c : void 0;
+  await admin({
+    method: "POST",
+    path: `${base}/external-issuers`,
+    body: { iss: a.iss.trim(), aud: a.aud.trim(), jwks_url: a.jwks.trim() || null, sub_semantics: a.sem, ...claim ? { claim_name: claim } : {} },
+    summary: `Add external issuer ${a.iss.trim()}`
+  });
+  console.log(import_chalk25.default.green("  JWT login method saved."));
+}
+async function issuerHome(base, issuer) {
+  const { default: inquirer2 } = await import("inquirer");
+  console.log(`
+  ${import_chalk25.default.bold(issuer.iss)}  ${import_chalk25.default.dim(`aud=${issuer.aud} \xB7 ${issuer.sub_semantics ?? ""}`)}`);
   const { act } = await inquirer2.prompt([{
     type: "list",
     name: "act",
-    message: "External JWT issuers:",
+    message: "This JWT login method:",
     choices: [
-      { name: "Add / replace one issuer", value: "add" },
-      ...issuers.length ? [{ name: "Delete an issuer", value: "rm" }] : [],
+      { name: "Replace it (re-enter details)", value: "edit" },
+      { name: import_chalk25.default.red("Delete it"), value: "rm" },
       { name: "\u2190 Back", value: "back" }
     ]
   }]);
   if (act === "back") return;
-  if (act === "add") {
-    const a = await inquirer2.prompt([
-      { type: "input", name: "iss", message: "Issuer URL (iss):", validate: (s) => !!s.trim() || "required" },
-      { type: "input", name: "aud", message: "Audience (aud):", validate: (s) => !!s.trim() || "required" },
-      { type: "input", name: "jwks", message: "JWKS URL (empty = derive from issuer):" },
-      { type: "list", name: "sem", message: "Where is the end-user id?", choices: [
-        { name: "The token sub IS the end user (tenant-owned)", value: "tenant_owned" },
-        { name: "Extract it from a claim\u2026", value: "extract_from_claim" }
-      ] }
-    ]);
-    const claim = a.sem === "extract_from_claim" ? (await inquirer2.prompt([{ type: "input", name: "c", message: "Claim name:", validate: (s) => !!s.trim() || "required" }])).c : void 0;
-    await admin({
-      method: "POST",
-      path: `${base}/external-issuers`,
-      body: { iss: a.iss.trim(), aud: a.aud.trim(), jwks_url: a.jwks.trim() || null, sub_semantics: a.sem, ...claim ? { claim_name: claim } : {} },
-      summary: `Add external issuer ${a.iss.trim()}`
-    });
-    console.log(import_chalk25.default.green("  Issuer saved."));
-  } else {
-    const { i } = await inquirer2.prompt([{
-      type: "list",
-      name: "i",
-      message: "Delete which issuer?",
-      choices: [...issuers.map((x) => ({ name: `${x.iss} (aud=${x.aud})`, value: x })), { name: "\u2190 Back", value: null }]
-    }]);
-    if (!i) return;
-    await admin({
-      method: "DELETE",
-      path: `${base}/external-issuers?iss=${encodeURIComponent(i.iss)}&aud=${encodeURIComponent(i.aud)}`,
-      summary: `Delete issuer ${i.iss}`
-    });
-    console.log(import_chalk25.default.green("  Issuer deleted."));
+  if (act === "edit") {
+    await addIssuer(base);
+    return;
   }
+  const { sure } = await inquirer2.prompt([{ type: "confirm", name: "sure", message: `Delete the JWT login method for ${issuer.iss}? Consumers using it can no longer sign in.`, default: false }]);
+  if (!sure) return;
+  await admin({
+    method: "DELETE",
+    path: `${base}/external-issuers?iss=${encodeURIComponent(issuer.iss)}&aud=${encodeURIComponent(issuer.aud)}`,
+    summary: `Delete issuer ${issuer.iss}`
+  });
+  console.log(import_chalk25.default.green("  Deleted."));
 }
-async function clientsMenu(teamId, tenant2, base) {
+async function setOpaque(base, cur) {
   const { default: inquirer2 } = await import("inquirer");
-  for (; ; ) {
-    const spinner = (0, import_ora11.default)("Loading app clients...").start();
-    const raw = await admin({ method: "GET", path: `${base}/app-clients`, summary: "List app clients" }).catch(() => []);
-    spinner.stop();
-    const clients = Array.isArray(raw) ? raw : [];
-    const { pick: pick2 } = await inquirer2.prompt([{
-      type: "list",
-      name: "pick",
-      message: `Login methods for ${tenant2}:`,
-      pageSize: 15,
-      choices: [
-        ...clients.map((c) => ({
-          name: `${import_chalk25.default.bold(c.name ?? c.clientId)}  ${import_chalk25.default.dim(`${c.clientId}${c.projectName ? ` \xB7 ${c.projectName}` : ""}`)}`,
-          value: c
-        })),
-        ...clients.length ? [] : [new inquirer2.Separator(import_chalk25.default.dim("  no app clients yet"))],
-        { name: "\uFF0B Add a login method\u2026", value: " create" },
-        { name: "\u2190 Back", value: " back" }
-      ]
-    }]);
-    if (pick2 === " back") return;
-    if (pick2 === " create") {
-      const a = await inquirer2.prompt([
-        { type: "input", name: "name", message: "Client name:", validate: (s) => !!s.trim() || "required" },
-        { type: "input", name: "callbacks", message: "Callback URLs (comma-separated, empty = none):" }
-      ]);
-      const created = await admin({
-        method: "POST",
-        path: `${base}/app-clients`,
-        body: {
-          name: a.name.trim(),
-          ...a.callbacks.trim() ? { authorizedCallbackUrls: parseList(a.callbacks) } : {}
-        },
-        summary: `Create app client "${a.name.trim()}"`
-      });
-      console.log(import_chalk25.default.green(`  Login method created${created?.clientId ? ` (${created.clientId})` : ""}.`));
-      continue;
-    }
-    await clientHome(base, pick2);
+  const a = await inquirer2.prompt([
+    { type: "input", name: "endpoint", message: "Introspection endpoint (https):", default: cur?.endpoint, validate: (s) => s.startsWith("https://") || "must be https" },
+    { type: "list", name: "method", message: "HTTP method:", choices: ["GET", "POST"], default: cur?.method ?? "GET" }
+  ]);
+  await admin({ method: "PUT", path: `${base}/opaque`, body: { opaque: { endpoint: a.endpoint, method: a.method } }, summary: "Set opaque validator" });
+  console.log(import_chalk25.default.green("  Opaque login method set."));
+}
+async function opaqueHome(base, cur) {
+  const { default: inquirer2 } = await import("inquirer");
+  console.log(`
+  ${import_chalk25.default.bold(cur.endpoint)}  ${import_chalk25.default.dim(cur.method ?? "GET")}`);
+  const { act } = await inquirer2.prompt([{
+    type: "list",
+    name: "act",
+    message: "This opaque login method:",
+    choices: [
+      { name: "Replace it", value: "edit" },
+      { name: import_chalk25.default.red("Delete it"), value: "rm" },
+      { name: "\u2190 Back", value: "back" }
+    ]
+  }]);
+  if (act === "back") return;
+  if (act === "edit") {
+    await setOpaque(base, cur);
+    return;
   }
+  await admin({ method: "PUT", path: `${base}/opaque`, body: { opaque: null }, summary: "Clear opaque validator" });
+  console.log(import_chalk25.default.green("  Deleted."));
 }
 async function clientHome(base, summary) {
   const { default: inquirer2 } = await import("inquirer");
@@ -4357,15 +4394,13 @@ async function transformsMenu(proj2) {
           { type: "input", name: "destination", message: `Destination field ${fieldHint}:`, validate: (s) => !!s || "required" },
           { type: "confirm", name: "strip", message: "Remove the source field after copying?", default: false }
         ]);
-        const source_fns = await buildFns("Transform the value as it is READ (source functions)");
-        const dest_fns = await buildFns("Transform the value as it is WRITTEN (destination functions)");
+        const source_fns = await buildFns("Transform the value");
         action2 = {
           type: "copy",
           source: a.source,
           destination: a.destination,
           ...a.strip ? { strip_source: true } : {},
-          ...source_fns.length ? { source_fns } : {},
-          ...dest_fns.length ? { dest_fns } : {}
+          ...source_fns.length ? { source_fns } : {}
         };
       }
       const condition = await buildCondition(ans.phase);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apiblaze",
-  "version": "0.16.0",
+  "version": "0.17.1",
   "description": "APIblaze CLI + sidecar — manage API proxies, run dev tunnels, and route a Next.js app's egress through APIblaze with one command",
   "keywords": [
     "apiblaze",