@oneaddress/setup 1.2.1 → 1.3.1

package/dist/index.js

@@ -856,8 +856,31 @@ var _R = ["\u2588\u2588\u2588\u2588\u2588\u2588 ", "\u2588\u2588   \u2588\u2588"
 var _S = [" \u2588\u2588\u2588\u2588\u2588\u2588", "\u2588\u2588     ", "\u2588\u2588     ", " \u2588\u2588\u2588\u2588\u2588 ", "     \u2588\u2588", "     \u2588\u2588", "\u2588\u2588\u2588\u2588\u2588\u2588 "];
 var ONE_ROWS = Array.from({ length: 7 }, (_3, i) => [_O[i], _N[i], _E[i]].join(" "));
 var ADDR_ROWS = Array.from({ length: 7 }, (_3, i) => [_A[i], _D2[i], _D2[i], _R[i], _E[i], _S[i], _S[i]].join(" "));
-var WIZARD_VERSION = true ? "1.2.1" : "?";
+var WIZARD_VERSION = true ? "1.3.1" : "?";
+function printCompactHeader() {
+  const INNER = 42;
+  const TOP = fn("\u250C") + dm("\u2500".repeat(INNER)) + fn("\u2510");
+  const BOT = fn("\u2514") + dm("\u2500".repeat(INNER)) + fn("\u2518");
+  const S3 = dm("\u2502");
+  const blank = ` ${S3}${" ".repeat(INNER)}${S3}`;
+  const row = (content, visibleLen) => ` ${S3}  ${content}${" ".repeat(Math.max(0, INNER - 2 - visibleLen))}${S3}`;
+  const ver = `v${WIZARD_VERSION}  \xB7  partners.oneaddress.io`;
+  console.log("");
+  console.log(" " + TOP);
+  console.log(blank);
+  console.log(row(wb("One ") + ab("Address"), "One Address".length));
+  console.log(row(mi("Partner Setup Wizard"), "Partner Setup Wizard".length));
+  console.log(row(fn(ver), ver.length));
+  console.log(blank);
+  console.log(" " + BOT);
+  console.log("");
+}
 function printHeader() {
+  const cols = typeof process !== "undefined" && process.stdout && process.stdout.columns ? process.stdout.columns : 80;
+  if (cols < 88) {
+    printCompactHeader();
+    return;
+  }
   const BAR_LEN = 85;
   const TOP_BAR = fn("\u250C") + dm("\u2500".repeat(BAR_LEN)) + fn("\u2510");
   const BOT_BAR = fn("\u2514") + dm("\u2500".repeat(BAR_LEN)) + fn("\u2518");
@@ -5201,7 +5224,7 @@ async function scaffold(platform, outputDir, partnerId, webhookSecret, webhookUr
 
 // src/register.ts
 var import_node_crypto = require("crypto");
-var PKG_VERSION = true ? "1.2.1" : "dev";
+var PKG_VERSION = true ? "1.3.1" : "dev";
 var REGISTER_URL = "https://partners.oneaddress.io/api/partner/installs";
 function hmacSha256(secret, message) {
   return (0, import_node_crypto.createHmac)("sha256", secret).update(message).digest("hex");
@@ -5686,7 +5709,13 @@ async function startTunnel(port) {
 // src/register-url.ts
 var import_node_crypto4 = require("crypto");
 var PORTAL_API = "https://partners.oneaddress.io/api/partner/webhook-url";
-async function getExistingWebhookUrl(partnerId, webhookSecret) {
+function describeReadFailure(status) {
+  if (status === 401) return "the portal rejected the signature (HTTP 401), which means your Webhook signing secret does not match the one on your profile. Copy it again from partners.oneaddress.io \u2192 Webhook \u2192 Webhook signing secret.";
+  if (status === 404) return "the portal has no active partner for this account (HTTP 404), which usually means it is not approved yet.";
+  if (status === 400) return "the portal rejected the request (HTTP 400).";
+  return `the portal returned HTTP ${status}.`;
+}
+async function getExistingWebhookUrl(partnerId, webhookSecret, onError) {
   try {
     const ts = String(Math.floor(Date.now() / 1e3));
     const sig = (0, import_node_crypto4.createHmac)("sha256", webhookSecret).update(`${ts}.`).digest("hex");
@@ -5699,14 +5728,18 @@ async function getExistingWebhookUrl(partnerId, webhookSecret) {
       },
       signal: AbortSignal.timeout(8e3)
     });
-    if (!res.ok) return void 0;
+    if (!res.ok) {
+      onError?.(describeReadFailure(res.status));
+      return void 0;
+    }
     const data = await res.json();
     return data.webhook_url ?? null;
-  } catch {
+  } catch (err) {
+    onError?.(`could not reach the portal (${err instanceof Error ? err.message : "network error"})`);
     return void 0;
   }
 }
-async function getVerifiesAccountReference(partnerId, webhookSecret) {
+async function getVerifiesAccountReference(partnerId, webhookSecret, onError) {
   try {
     const ts = String(Math.floor(Date.now() / 1e3));
     const sig = (0, import_node_crypto4.createHmac)("sha256", webhookSecret).update(`${ts}.`).digest("hex");
@@ -5719,13 +5752,17 @@ async function getVerifiesAccountReference(partnerId, webhookSecret) {
       },
       signal: AbortSignal.timeout(8e3)
     });
-    if (!res.ok) return void 0;
+    if (!res.ok) {
+      onError?.(describeReadFailure(res.status));
+      return void 0;
+    }
     const data = await res.json();
     const v2 = data.verifies_account_reference;
     if (v2 === true || v2 === false) return v2;
     if (v2 === null) return null;
     return void 0;
-  } catch {
+  } catch (err) {
+    onError?.(`could not reach the portal (${err instanceof Error ? err.message : "network error"})`);
     return void 0;
   }
 }
@@ -5759,20 +5796,26 @@ async function registerWebhookUrl(partnerId, webhookSecret, webhookUrl) {
   }
 }
 
-// src/admin-gate.ts
+// src/cli-gate.ts
 var MAX_ATTEMPTS = 3;
 var AUTH_URL = "https://partners.oneaddress.io/api/cli/auth";
-async function checkCredentials(user, pass) {
+async function checkToken(token) {
   try {
     const res = await fetch(AUTH_URL, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ username: user.trim(), password: pass.trim() }),
+      body: JSON.stringify({ token: token.trim() }),
       signal: AbortSignal.timeout(8e3)
     });
-    if (res.status === 200) return { ok: true };
-    if (res.status === 401) return { ok: false, reason: "Invalid credentials" };
-    if (res.status === 429) return { ok: false, reason: "Rate-limited \u2014 wait 60 s and retry", retryable: true };
+    if (res.status === 200) {
+      const data = await res.json().catch(() => ({}));
+      if (data.ok && typeof data.partnerId === "string" && data.partnerId) {
+        return { ok: true, partnerId: data.partnerId };
+      }
+      return { ok: false, reason: "Portal did not return a partner for this token, is it a CLI token from Profile \u2192 CLI Access?" };
+    }
+    if (res.status === 401) return { ok: false, reason: "Token not accepted" };
+    if (res.status === 429) return { ok: false, reason: "Rate-limited, wait 60 s and retry", retryable: true };
     const body = await res.json().catch(() => ({}));
     return {
       ok: false,
@@ -5787,35 +5830,26 @@ async function checkCredentials(user, pass) {
     };
   }
 }
-async function adminGate() {
+async function cliGate() {
   for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
-    const user = await he({
-      message: attempt === 1 ? "OneAddress CLI Username" : `OneAddress CLI Username  (attempt ${attempt}/${MAX_ATTEMPTS})`,
-      placeholder: "oneaddress",
-      validate: (v2) => v2.trim() ? void 0 : "Username is required"
-    });
-    if (pD(user)) {
-      xe("Cancelled.");
-      process.exit(0);
-    }
-    const pass = await ge({
-      message: "OneAddress CLI Password",
-      validate: (v2) => v2.trim() ? void 0 : "Password is required"
+    const token = await ge({
+      message: attempt === 1 ? "OneAddress CLI token  (Profile \u2192 CLI Access in the portal)" : `OneAddress CLI token  (attempt ${attempt}/${MAX_ATTEMPTS})`,
+      validate: (v2) => v2.trim() ? void 0 : "CLI token is required"
     });
-    if (pD(pass)) {
+    if (pD(token)) {
       xe("Cancelled.");
       process.exit(0);
     }
-    const result = await checkCredentials(user, pass);
-    if (result.ok) return;
+    const result = await checkToken(token);
+    if (result.ok) return { partnerId: result.partnerId };
     if (result.retryable) {
-      M2.warn(`  ${result.reason} \u2014 retry the same credentials.`);
+      M2.warn(`  ${result.reason}, retry the same token.`);
       attempt--;
       continue;
     }
     if (attempt < MAX_ATTEMPTS) {
       const remaining = MAX_ATTEMPTS - attempt;
-      M2.error(`  ${result.reason} \u2014 ${remaining} attempt${remaining === 1 ? "" : "s"} remaining.`);
+      M2.error(`  ${result.reason}, ${remaining} attempt${remaining === 1 ? "" : "s"} remaining.`);
     } else {
       M2.error(`  ${result.reason}.`);
     }
@@ -5989,26 +6023,20 @@ function stripControlChars(line) {
 async function main() {
   printHeader();
   Ie("OneAddress Partner Setup");
-  await adminGate();
+  const { partnerId: pid } = await cliGate();
+  if (!UUID_RE.test(pid)) {
+    xe("The portal returned an unexpected partner id. Please retry, or contact support.");
+    process.exit(1);
+  }
   M2.info("We will:");
-  M2.info("  1. Collect your credentials from the Partner Portal");
+  M2.info("  1. Collect your remaining credentials from the Partner Portal");
   M2.info("  2. Scaffold a working webhook server for your platform");
   M2.info("  3. Get it live with a passing conformance check \u2014 in under 5 minutes");
-  M2.info("\nOpen partners.oneaddress.io \u2192 My Profile to find all three values below.\n");
-  const partnerId = await he({
-    message: "Your Partner ID  (UUID format)",
-    placeholder: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
-    validate: (v2) => {
-      if (!v2.trim()) return "Partner ID is required";
-      if (!UUID_RE.test(v2.trim()))
-        return "Must be a valid UUID \u2014 find it at partners.oneaddress.io \u2192 My Profile";
-    }
-  });
-  assertNotCancelled(partnerId);
+  M2.info("\nOpen partners.oneaddress.io \u2192 My Profile to find the two values below.\n");
   const webhookSecret = await ge({
-    message: "Your Webhook Secret  (min 20 chars)",
+    message: "Your Webhook signing secret  (min 20 chars)",
     validate: (v2) => {
-      if (!v2.trim()) return "Webhook Secret is required";
+      if (!v2.trim()) return "Webhook signing secret is required";
       if (v2.length < 20) return "That looks too short \u2014 paste the full secret from My Profile";
     }
   });
@@ -6024,7 +6052,6 @@ async function main() {
     }
   });
   assertNotCancelled(privateKeyRaw);
-  const pid = partnerId.trim();
   const secret = webhookSecret.trim();
   const normalised = normalisePrivateKey(privateKeyRaw.trim());
   if (normalised.error) {
@@ -6069,11 +6096,14 @@ async function main() {
       }
     }
   }
-  const accountRefDeclaration = await getVerifiesAccountReference(pid, secret);
+  let accountRefReason = "";
+  const accountRefDeclaration = await getVerifiesAccountReference(pid, secret, (r2) => {
+    accountRefReason = r2;
+  });
   const verifiesAccountReference = accountRefDeclaration === true;
   if (accountRefDeclaration === void 0) {
     M2.warn(
-      "Could not read your account-reference declaration from the portal.\nConformance check-14 has been left out of the generated `npm test`, so a\npassing run does NOT mean your receiver matches account references correctly.\nSet it at partners.oneaddress.io \u2192 My Profile, then re-run this wizard."
+      "Could not read your account-reference declaration from the portal.\n" + (accountRefReason ? "Reason: " + accountRefReason + "\n" : "") + "Conformance check-14 has been left out of the generated `npm test`, so a\npassing run does NOT mean your receiver matches account references correctly.\nSet it at partners.oneaddress.io \u2192 My Profile, then re-run this wizard."
     );
   }
   const s1 = Y2();
@@ -6147,7 +6177,10 @@ async function main() {
     if (start.output) M2.warn(start.output.slice(0, 600));
   }
   let webhookUrl = "";
-  const existingUrlResult = await getExistingWebhookUrl(pid, secret);
+  let existingUrlReason = "";
+  const existingUrlResult = await getExistingWebhookUrl(pid, secret, (r2) => {
+    existingUrlReason = r2;
+  });
   if (typeof existingUrlResult === "string") {
     M2.warn(
       `A webhook URL is already registered for this partner:
@@ -6166,7 +6199,7 @@ Continuing will overwrite it.`
     }
   } else if (existingUrlResult === void 0) {
     M2.warn(
-      "Could not check whether a webhook URL is already registered (portal API unreachable). Any URL you register now will overwrite an existing one without warning."
+      "Could not check whether a webhook URL is already registered" + (existingUrlReason ? ": " + existingUrlReason : " (portal API unreachable).") + "\nAny URL you register now will overwrite an existing one without warning."
     );
     const continueAnyway = await ye({
       message: "Continue anyway?",

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@oneaddress/setup",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "Interactive setup wizard for OneAddress partner webhook integrations",
   "main": "dist/index.js",
   "bin": {
     "oneaddress-setup": "dist/index.js"
   },
   "files": [
-    "LICENSE", "dist",
+    "LICENSE",
+    "dist",
     "README.md"
   ],
   "scripts": {