@getxflow/cli 0.6.5 → 0.7.0

package/dist/session.js

@@ -2,21 +2,84 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = connect;
 exports.anonymous = anonymous;
+exports.findProjectOrg = findProjectOrg;
+exports.connectProject = connectProject;
+const api_1 = require("./api");
 const config_1 = require("./config");
 const credentials_1 = require("./credentials");
 const errors_1 = require("./errors");
+const ui_1 = require("./ui");
 /** Platform connection: address plus key. */
 function connect(config) {
     const apiUrl = (0, config_1.apiUrlFor)(config);
-    // XFLOW_TOKEN never follows an address taken from the repo's xflow.json:
-    // a cloned config must not be able to redirect the key elsewhere.
-    const token = (0, credentials_1.resolveToken)(apiUrl, apiUrl === (0, config_1.apiUrlFor)());
-    if (!token) {
+    const root = (0, config_1.findProjectRoot)();
+    const picked = (0, credentials_1.pickKey)({
+        env: process.env.XFLOW_TOKEN?.trim() || null,
+        // XFLOW_TOKEN never follows an address taken from the repo's xflow.json:
+        // a cloned config must not be able to redirect the key elsewhere.
+        envAllowed: apiUrl === (0, config_1.apiUrlFor)(),
+        folderOrg: root ? ((0, config_1.readState)(root).organizationId ?? null) : null,
+        ...(0, credentials_1.storedKeyInputs)(apiUrl),
+    });
+    if (!picked) {
         throw new errors_1.CliError(`No access key for ${apiUrl}`, 'Sign in: xflow login. In CI pass the key in the XFLOW_TOKEN variable');
     }
-    return { apiUrl, token };
+    if ('missing' in picked) {
+        throw new errors_1.CliError(`This folder is bound to the organization ${picked.organizationId}, and there is no stored key for it`, 'Sign in to that organization: xflow login. The stored ones: xflow org');
+    }
+    return { apiUrl, token: picked.token, source: picked.source, organizationId: picked.organizationId };
 }
 /** Sign-in only. */
 function anonymous(config) {
     return { apiUrl: (0, config_1.apiUrlFor)(config), token: '' };
 }
+/**
+ * Which signed-in organization serves the project. Project ids are unique
+ * across the platform, so a 404 means "not this one" and exactly one
+ * organization can answer. A dead key must not end the search: the answer may
+ * sit behind the next one.
+ */
+async function findProjectOrg(apiUrl, projectId) {
+    const dead = [];
+    for (const candidate of (0, credentials_1.listOrgs)(apiUrl)) {
+        try {
+            await (0, api_1.apiJson)({ apiUrl, token: candidate.token }, `/api/v1/projects/${projectId}`);
+            return { hit: candidate, dead };
+        }
+        catch (e) {
+            if (e instanceof api_1.ApiError && (e.status === 401 || e.status === 403)) {
+                dead.push(candidate);
+                continue;
+            }
+            if (e instanceof api_1.ApiError && e.status === 404)
+                continue;
+            throw e;
+        }
+    }
+    return { hit: null, dead };
+}
+/**
+ * Connection for project commands. A folder not yet bound to an organization
+ * gets probed once: the organization that serves the project is found and
+ * written into .xflow/state.json, so every later command resolves the key
+ * synchronously. With one stored key there is nothing to probe.
+ */
+async function connectProject(root, config) {
+    const session = connect(config);
+    if (session.source !== 'active' || session.organizationId === null)
+        return session;
+    const orgs = (0, credentials_1.listOrgs)(session.apiUrl);
+    if (orgs.length <= 1)
+        return session;
+    const { hit, dead } = await findProjectOrg(session.apiUrl, config.projectId);
+    if (!hit) {
+        throw new errors_1.CliError(`No signed-in organization holds the project ${config.projectId}`, dead.length > 0
+            ? `The key of ${dead.map((d) => d.name ?? d.organizationId).join(', ')} is not working (sign in again: xflow login); the project may live there`
+            : 'Check projectId in xflow.json, or sign in to the organization that owns it: xflow login');
+    }
+    (0, config_1.writeState)(root, { organizationId: hit.organizationId });
+    if (hit.organizationId !== session.organizationId) {
+        (0, ui_1.note)((0, ui_1.dim)(`  The project belongs to "${hit.name ?? hit.organizationId}", not to the active organization: the folder is bound to it`));
+    }
+    return { apiUrl: session.apiUrl, token: hit.token, source: 'folder', organizationId: hit.organizationId };
+}

package/dist/version.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_API_URL = exports.CLI_VERSION = void 0;
 /** Keep in sync with cli/package.json. */
-exports.CLI_VERSION = '0.6.5';
+exports.CLI_VERSION = '0.7.0';
 /** Overridden by XFLOW_API_URL or the `api` field in xflow.json. */
 exports.DEFAULT_API_URL = 'https://app.getxflow.com';

package/package.json

@@ -1,23 +1,23 @@
-{
-  "name": "@getxflow/cli",
-  "version": "0.6.5",
-  "description": "CLI for the XFlow platform: source sync, deployment and publishing of applications",
-  "license": "UNLICENSED",
-  "engines": {
-    "node": ">=20"
-  },
-  "bin": {
-    "xflow": "dist/bin.js"
-  },
-  "files": [
-    "dist",
-    "skills"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "prepublishOnly": "npm run build"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "@getxflow/cli",
+  "version": "0.7.0",
+  "description": "CLI for the XFlow platform: source sync, deployment and publishing of applications",
+  "license": "UNLICENSED",
+  "engines": {
+    "node": ">=20"
+  },
+  "bin": {
+    "xflow": "dist/bin.js"
+  },
+  "files": [
+    "dist",
+    "skills"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "prepublishOnly": "npm run build"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}