@oneaddress/setup 1.2.1 → 1.3.0

package/dist/index.js

@@ -856,7 +856,7 @@ 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.0" : "?";
 function printHeader() {
   const BAR_LEN = 85;
   const TOP_BAR = fn("\u250C") + dm("\u2500".repeat(BAR_LEN)) + fn("\u2510");
@@ -5201,7 +5201,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.0" : "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");
@@ -5759,20 +5759,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 +5793,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,22 +5986,16 @@ 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)",
     validate: (v2) => {
@@ -6024,7 +6015,6 @@ async function main() {
     }
   });
   assertNotCancelled(privateKeyRaw);
-  const pid = partnerId.trim();
   const secret = webhookSecret.trim();
   const normalised = normalisePrivateKey(privateKeyRaw.trim());
   if (normalised.error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oneaddress/setup",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Interactive setup wizard for OneAddress partner webhook integrations",
   "main": "dist/index.js",
   "bin": {