@construct-space/cli 1.8.0 → 1.8.1

package/dist/index.js

@@ -2876,26 +2876,92 @@ function listDesktopProfiles() {
   }
   return results;
 }
-function credentialsPath() {
-  return join12(dataDir(), CREDENTIALS_FILE);
+function legacyCredentialsPath() {
+  return join12(dataDir(), LEGACY_CREDENTIALS_FILE);
 }
-function store(creds) {
-  const path = credentialsPath();
+function registryPath() {
+  return join12(dataDir(), PROFILES_REGISTRY);
+}
+function readRegistry() {
+  const path = registryPath();
+  if (!existsSync10(path))
+    return {};
+  try {
+    return JSON.parse(readFileSync7(path, "utf-8"));
+  } catch {
+    return {};
+  }
+}
+function writeRegistry(reg) {
+  const path = registryPath();
   mkdirSync4(dirname4(path), { recursive: true });
-  writeFileSync5(path, JSON.stringify(creds, null, 2) + `
-`, { mode: 384 });
+  writeFileSync5(path, JSON.stringify({ version: 1, ...reg }, null, 2));
 }
-function load2() {
-  const path = credentialsPath();
-  if (existsSync10(path)) {
-    const data = JSON.parse(readFileSync7(path, "utf-8"));
-    if (data.token) {
-      if (!data.publisherKey && data.token.startsWith("csk_live_")) {
-        data.publisherKey = data.token;
-      }
-      return data;
-    }
+function store(creds) {
+  const profileId = creds.profileId || creds.user?.id;
+  if (!profileId) {
+    throw new Error("cannot store credentials without a profile id (user.id or profileId)");
+  }
+  const profilePath = join12(profilesDir(), profileId, "auth.json");
+  mkdirSync4(dirname4(profilePath), { recursive: true });
+  let existing = {};
+  if (existsSync10(profilePath)) {
+    try {
+      existing = JSON.parse(readFileSync7(profilePath, "utf-8"));
+    } catch {}
+  }
+  existing.token = creds.token;
+  existing.authenticated = true;
+  existing.updated_at = new Date().toISOString();
+  if (creds.user) {
+    existing.user = { ...existing.user, ...creds.user };
+  }
+  if (creds.publisherKey) {
+    existing.publisher = {
+      ...existing.publisher,
+      name: creds.publisherName || existing.publisher?.name || "",
+      kind: creds.publisherKind || existing.publisher?.kind || "user",
+      api_key: creds.publisherKey
+    };
+  }
+  writeFileSync5(profilePath, JSON.stringify(existing, null, 2), { mode: 384 });
+  const reg = readRegistry();
+  reg.active_profile = profileId;
+  reg.profiles = reg.profiles || [];
+  const existingEntry = reg.profiles.find((p) => p.id === profileId);
+  if (existingEntry) {
+    if (creds.user?.name)
+      existingEntry.name = creds.user.name;
+    if (creds.user?.email)
+      existingEntry.email = creds.user.email;
+  } else if (creds.user) {
+    reg.profiles.push({
+      id: profileId,
+      name: creds.user.name,
+      email: creds.user.email
+    });
   }
+  writeRegistry(reg);
+}
+function migrateLegacyCredentials() {
+  const legacy = legacyCredentialsPath();
+  if (!existsSync10(legacy))
+    return;
+  try {
+    const data = JSON.parse(readFileSync7(legacy, "utf-8"));
+    if (!data.token)
+      return;
+    const pid = data.profileId || data.user?.id;
+    if (!pid)
+      return;
+    const profilePath = join12(profilesDir(), pid, "auth.json");
+    if (existsSync10(profilePath))
+      return;
+    store({ ...data, profileId: pid });
+  } catch {}
+}
+function load2() {
+  migrateLegacyCredentials();
   const fromProfile = loadFromActiveProfile();
   if (fromProfile)
     return fromProfile;
@@ -2945,11 +3011,24 @@ function isAuthenticated() {
   }
 }
 function clear() {
-  const path = credentialsPath();
-  if (existsSync10(path))
-    unlinkSync(path);
+  const reg = readRegistry();
+  const activeId = reg.active_profile;
+  if (activeId) {
+    const profilePath = join12(profilesDir(), activeId, "auth.json");
+    if (existsSync10(profilePath)) {
+      try {
+        const data = JSON.parse(readFileSync7(profilePath, "utf-8"));
+        data.authenticated = false;
+        data.updated_at = new Date().toISOString();
+        writeFileSync5(profilePath, JSON.stringify(data, null, 2), { mode: 384 });
+      } catch {}
+    }
+  }
+  const legacy = legacyCredentialsPath();
+  if (existsSync10(legacy))
+    unlinkSync(legacy);
 }
-var CREDENTIALS_FILE = "credentials.json", DEFAULT_PORTAL = "https://my.construct.space/api/developer";
+var LEGACY_CREDENTIALS_FILE = "credentials.json", PROFILES_REGISTRY = "profiles.json", DEFAULT_PORTAL = "https://my.construct.space/api/developer";
 var init_auth = __esm(() => {
   init_appdir();
 });
@@ -10786,6 +10865,19 @@ async function loginFromProfile(profiles) {
   console.log(source_default.dim(`  profile: ${picked.id}`));
 }
 async function loginWithToken(token) {
+  if (token.startsWith("cst_live_")) {
+    console.error(source_default.red("cst_live_* tokens are being retired."));
+    console.error(source_default.dim("  Sign in via the Construct desktop app, or get a new"));
+    console.error(source_default.dim(`  identity token at ${source_default.cyan("https://my.construct.space/settings/tokens")}.`));
+    process.exit(1);
+  }
+  if (token.startsWith("csk_live_")) {
+    console.error(source_default.red("That's a publisher key, not an identity token."));
+    console.error(source_default.dim("  Publisher keys (csk_live_*) authorize publish-as-publisher"));
+    console.error(source_default.dim("  on top of identity. Pass an identity token (cat_*) here;"));
+    console.error(source_default.dim("  the CLI loads your publisher key automatically once logged in."));
+    process.exit(1);
+  }
   let resp;
   try {
     resp = await fetch(ACCOUNTS_SCOPE_URL, {
@@ -11501,7 +11593,7 @@ function graphFork(newSpaceID) {
 // package.json
 var package_default = {
   name: "@construct-space/cli",
-  version: "1.8.0",
+  version: "1.8.1",
   description: "Construct CLI \u2014 scaffold, build, develop, and publish spaces",
   type: "module",
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@construct-space/cli",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "Construct CLI — scaffold, build, develop, and publish spaces",
   "type": "module",
   "bin": {