@cyberxon/xon 0.3.0 → 0.3.1

package/dist/cli.js

@@ -10,7 +10,7 @@ import { cancelDeploy, COVERAGE_FORMATTERS, previewDeploy, quickDeploy, reportDe
 import { previewRetrieve, resumeRetrieve, startRetrieve } from "./retrieve.js";
 import { collectSourceFiles, writeSourceFiles } from "./source.js";
 import { displayOrg, loginAccessToken, loginCredentials, loginJwt, loginSfdxUrl, loginWeb, logoutOrg, openInBrowser, openOrg } from "./org.js";
-import { clearOrgs, listOrgs } from "./org-store.js";
+import { clearOrgs, listOrgs, tryGetOrg } from "./org-store.js";
 import { applyFlagsDir } from "./flags-dir.js";
 const cliVersion = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version;
 const program = new Command();
@@ -30,7 +30,12 @@ async function apiClient(options) {
     if (!baseUrl) {
         throw new Error("An API base URL is required. Set XON_BASE_URL, pass --base-url, or run 'xon org login' inside a project to save one.");
     }
-    return new ApiClient({ baseUrl, token: options.token ?? process.env.XON_TOKEN });
+    let token = options.token ?? process.env.XON_TOKEN;
+    if (!token) {
+        const org = await tryGetOrg(options.targetOrg ?? project?.defaultOrg);
+        token = org?.token;
+    }
+    return new ApiClient({ baseUrl, token });
 }
 async function requireProjectRoot() {
     try {

package/dist/org-store.js

@@ -13,8 +13,8 @@ async function readStore() {
     }
 }
 async function writeStore(data) {
-    await mkdir(storeDir, { recursive: true });
-    await writeFile(storePath, `${JSON.stringify(data, null, 2)}\n`);
+    await mkdir(storeDir, { recursive: true, mode: 0o700 });
+    await writeFile(storePath, `${JSON.stringify(data, null, 2)}\n`, { mode: 0o600 });
 }
 export async function saveOrg(record, setDefault) {
     const data = await readStore();
@@ -54,3 +54,11 @@ export async function listOrgs() {
     const data = await readStore();
     return { orgs: Object.values(data.orgs), defaultOrg: data.defaultOrg };
 }
+export async function tryGetOrg(alias) {
+    try {
+        return await getOrg(alias);
+    }
+    catch {
+        return undefined;
+    }
+}

package/dist/org.js

@@ -9,13 +9,14 @@ export function openInBrowser(url) {
             : `xdg-open "${url}"`;
     exec(command);
 }
-async function finishLogin(response, alias, setDefault) {
+async function finishLogin(response, alias, setDefault, tokenOverride) {
     const record = {
         alias: alias ?? response.username,
         orgId: response.orgId,
         username: response.username,
         instanceUrl: response.instanceUrl,
         connectedAt: new Date().toISOString(),
+        token: tokenOverride ?? response.token,
     };
     await saveOrg(record, setDefault);
     return record;
@@ -56,7 +57,7 @@ export async function loginAccessToken(client, options) {
         instanceUrl: options.instanceUrl,
         accessToken: options.accessToken,
     });
-    return finishLogin(response, options.alias, options.setDefault);
+    return finishLogin(response, options.alias, options.setDefault, options.accessToken);
 }
 export async function loginCredentials(client, options) {
     const { token } = await client.post("/auth/login", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyberxon/xon",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "A CLI for Xon projects and deployments",
   "type": "module",
   "license": "UNLICENSED",