@illuminis/comprism 0.1.4 → 0.1.6

package/out/commands/login.js

@@ -78,6 +78,7 @@ const connection_1 = require("../lib/connection");
 const gateway_1 = require("../lib/gateway");
 const ui = __importStar(require("../lib/ui"));
 const prompt_1 = require("../lib/prompt");
+const words_1 = require("../lib/words");
 const out = (s = '') => process.stdout.write(s + '\n');
 /** Where a named workspace lives. One format, stated once. */
 const WORKSPACE_DOMAIN = 'completionprism.illuminis.ai';
@@ -103,6 +104,21 @@ function workspaceUrl(typed) {
         return `https://${value}`;
     return `https://${value}.${WORKSPACE_DOMAIN}`;
 }
+/**
+ * Where an organization signs in. A full address is used as typed. A bare name
+ * is turned into its address by the service, so every client follows one rule
+ * (service catalog 1).
+ */
+async function addressOf(typed) {
+    const value = typed.trim().replace(/\/+$/, '');
+    if (/^[A-Za-z0-9][A-Za-z0-9-]{0,62}$/.test(value) && value.toLowerCase() !== 'localhost') {
+        const reply = await (0, gateway_1.askAt)(`https://${WORKSPACE_DOMAIN}`, { intent: 'resolve_workspace', prompt: value });
+        const url = reply.session?.workspace_url;
+        if (url)
+            return url.replace(/\/+$/, '');
+    }
+    return workspaceUrl(value);
+}
 /** Localhost needs the tenant named, because there is no subdomain to read. */
 function tenantFor(url, typed, flagged) {
     if (flagged)
@@ -168,8 +184,8 @@ async function approveInBrowser(url, tenant, noBrowser) {
         const res = await fetch(`${url}/oauth/device_authorization`, form({ client_id: CLIENT_ID, scope: 'api:read api:write' }));
         if (!res.ok) {
             out(ui.fail(res.status === 404 || res.status === 405
-                ? 'That workspace is running a build without browser sign in.'
-                : 'The workspace would not start a browser sign in.'));
+                ? 'That organization is running a build without browser sign in.'
+                : 'The organization would not start a browser sign in.'));
             return '';
         }
         started = await res.json();
@@ -234,14 +250,40 @@ async function runLogin(args) {
         process.exitCode = 1;
         return;
     }
-    out(ui.banner('Sign in'));
+    // Under the session's own mark when the session is about to open, so the
+    // name is not drawn twice in a row.
+    out(args.includes('--into-session') ? `  ${ui.c.bold('Sign in')}` : ui.banner('Sign in'));
     out();
     // Flags still work, for a script or a second machine. A person gets asked.
     const flag = (name) => {
         const i = args.indexOf(name);
         return i >= 0 ? args[i + 1] : undefined;
     };
-    const username = flag('--username') || flag('--email') || await (0, prompt_1.ask)('  email:    ');
+    // THE LAST PERSON, OFFERED. Signing in again is Enter: the email and the
+    // workspace they used last time, exactly as they were, so a local workspace
+    // stays local instead of being looked up again and sent to production.
+    const { readLast, saveLast, forgetLast, savedPassword, savePassword, forgetPassword, keychainAvailable } = await Promise.resolve().then(() => __importStar(require('../lib/lastlogin')));
+    if (args.includes('--forget')) {
+        forgetLast();
+        out(ui.ok('The last sign in and any saved password on this Mac are forgotten.'));
+        out();
+        return;
+    }
+    const last = flag('--username') || flag('--email') || (flag('--organization') || flag('--workspace')) ? null : readLast();
+    if (last) {
+        out(`  ${ui.c.dim('last time')}  ${ui.c.bold(last.email)} ${ui.c.dim('at')} ${ui.c.bold(last.workspace)}`);
+        out(`  ${ui.c.dim('press Enter to sign in as them, or type another email')}`);
+    }
+    const typedEmail = flag('--username') || flag('--email') || await (0, prompt_1.askOrCancel)('  email:    ');
+    // Ctrl+C is "never mind", not "yes, the last person".
+    if (typedEmail === null) {
+        out();
+        out(ui.c.dim('  sign in canceled'));
+        out();
+        return;
+    }
+    const username = typedEmail || last?.email || '';
+    const again = Boolean(last && username === last.email);
     if (!username) {
         out(ui.fail('An email address is needed.'));
         out();
@@ -249,14 +291,15 @@ async function runLogin(args) {
         return;
     }
     // Where this person's workspace is. Asked of the product, not of them.
-    let typedWorkspace = flag('--workspace');
+    let typedWorkspace = (flag('--organization') || flag('--workspace')) || (again ? last?.workspace : undefined);
     // Captured BEFORE the email lookup can fill it in. A workspace the product
     // worked out is not a workspace the person typed, and only the second may be
-    // a local address. See the fence in `writeConnection`.
-    const typedByHand = Boolean(typedWorkspace);
+    // a local address. See the fence in `writeConnection`. The last sign in
+    // counts as typed only if it was typed then.
+    const typedByHand = Boolean((flag('--organization') || flag('--workspace'))) || Boolean(again && last?.typed);
     if (!typedWorkspace) {
         const live = new ui.LiveIndicator();
-        live.start('finding your workspace');
+        live.start('finding your organization');
         try {
             typedWorkspace = (await resolveWorkspace(username)) || undefined;
         }
@@ -268,18 +311,18 @@ async function runLogin(args) {
         process.stdout.write('\r');
         if (!typedWorkspace) {
             out();
-            out(ui.fail('No workspace is registered for that email address.'));
-            out(`      ${ui.c.dim('if your company uses a different domain, pass --workspace <name>')}`);
+            out(ui.fail('No organization is registered for that email address.'));
+            out(`      ${ui.c.dim('if your company uses a different domain, pass --organization <name>')}`);
             out();
             process.exitCode = 1;
             return;
         }
     }
-    const url = workspaceUrl(typedWorkspace);
+    const url = await addressOf(typedWorkspace);
     const tenant = tenantFor(url, typedWorkspace, flag('--tenant'));
     // Said before the password is asked for, so a person can see which company
     // they are about to sign in to (manual 1.3).
-    out(`  workspace: ${url}`);
+    out(`  organization: ${url}`);
     // COMPANY LOGIN (manual 1.10). A workspace whose company signs in through
     // its own identity provider is signed in to in a browser; this tool never
     // sees that password. `--device` is the same thing for a machine with no
@@ -292,7 +335,11 @@ async function runLogin(args) {
         process.exitCode = 1;
         return;
     }
-    const password = byCompany ? '' : await (0, prompt_1.askHidden)('  password: ');
+    // The keychain first, when the person chose to keep it there last time.
+    const kept = byCompany ? null : savedPassword(username, typedWorkspace);
+    if (kept)
+        out(`  ${ui.c.dim('password: from your Mac keychain')}`);
+    const password = byCompany ? '' : kept || await (0, prompt_1.askHidden)('  password: ');
     if (!byCompany && !password) {
         out(ui.fail('A password is needed.'));
         out();
@@ -315,8 +362,8 @@ async function runLogin(args) {
         }, tenant);
         if (reply.served === false) {
             out();
-            out(ui.fail('That workspace is running a build that cannot sign you in yet.'));
-            out(`      ${ui.c.dim(reply.message || 'the workspace is behind this copy of the tool')}`);
+            out(ui.fail('That organization is running a build that cannot sign you in yet.'));
+            out(`      ${ui.c.dim(reply.message || 'the organization is behind this copy of the tool')}`);
             out();
             process.exitCode = 1;
             return;
@@ -357,9 +404,13 @@ async function runLogin(args) {
             }
         }
         if (!reply.sign_in?.token) {
+            // A kept password that no longer works is removed, so the next sign in
+            // asks for the new one instead of failing the same way again.
+            if (kept)
+                forgetPassword(username, typedWorkspace);
             out();
             out(ui.fail(reply.message || 'That username and password were not accepted.'));
-            out(`      ${ui.c.dim('check the workspace name too: a right password in the wrong workspace looks the same')}`);
+            out(`      ${ui.c.dim('check the organization name too: a right password in the wrong organization looks the same')}`);
             out();
             process.exitCode = 1;
             return;
@@ -412,7 +463,7 @@ async function runLogin(args) {
     }
     catch (err) {
         out();
-        out(ui.fail(err instanceof Error ? err.message : 'the workspace address was refused'));
+        out(ui.fail(err instanceof Error ? err.message : (0, words_1.word)('addressRefused')));
         out();
         process.exitCode = 1;
         return;
@@ -420,14 +471,33 @@ async function runLogin(args) {
     // So a new terminal presents the key just issued, not the last one or none.
     for (const profile of (await Promise.resolve().then(() => __importStar(require('./install')))).finishSetup())
         out(`  Finishing setup: added one line to ${profile}`);
+    // Remembered for next time: who, and where, exactly as used now.
+    saveLast({ email: username, workspace: typedWorkspace, typed: typedByHand });
+    if (!byCompany && !kept && password && keychainAvailable()) {
+        const keep = (await (0, prompt_1.ask)('  keep your password in your Mac keychain, so next time is just Enter? (y/n) '))
+            .trim().toLowerCase();
+        if (keep === 'y' || keep === 'yes') {
+            out(savePassword(username, typedWorkspace, password)
+                ? `  ${ui.c.dim('kept in your keychain; remove it with')} ${ui.c.bold('comprism login --forget')}`
+                : `  ${ui.c.dim('the keychain would not take it; you will be asked next time')}`);
+        }
+    }
     out();
-    out(ui.ok(`Signed in as ${ui.c.bold(username)} at ${ui.c.bold(signedIn?.workspace_url || url)}.`));
+    // Where this machine will actually talk to: the address typed, when one was.
+    const where = (typedByHand && url) || signedIn?.workspace_url || url;
+    const onLaptop = /localhost|127\.0\.0\.1/.test(where);
+    out(ui.ok(`Signed in as ${ui.c.bold(username)} ${onLaptop
+        ? `on this laptop (${ui.c.bold(where.replace(/^https?:\/\//, ''))})`
+        : `at ${ui.c.bold(where)}`}.`));
     if (workspaceKey) {
         out(`      ${ui.c.dim('This machine is enrolled and can be revoked from Administration.')}`);
         // Straight into the welcome screen, so the first thing after signing in is
         // where they are rather than another instruction.
-        const { showWelcome } = await Promise.resolve().then(() => __importStar(require('./welcome')));
-        await showWelcome();
+        // Unless the session is about to open, which draws it itself.
+        if (!args.includes('--into-session')) {
+            const { showWelcome } = await Promise.resolve().then(() => __importStar(require('./welcome')));
+            await showWelcome();
+        }
     }
     else {
         process.exitCode = 1;
@@ -435,7 +505,7 @@ async function runLogin(args) {
         // The workspace's OWN reason, carried back with the sign in. It used to
         // come from a local variable set by a separate call, which meant a blank
         // line whenever that call had not been the thing that failed.
-        out(`      ${ui.c.dim(signInMessage || 'the workspace did not say why')}`);
+        out(`      ${ui.c.dim(signInMessage || 'the organization did not say why')}`);
         out(`      ${ui.c.dim('you are signed in; this machine cannot ask for work until it is enrolled')}`);
     }
     out();
@@ -446,13 +516,13 @@ async function loginWithKey(key, args) {
         const i = args.indexOf(name);
         return i >= 0 ? args[i + 1] : undefined;
     };
-    const typed = flag('--workspace');
+    const typed = (flag('--organization') || flag('--workspace'));
     if (!key || !typed) {
-        out(ui.fail('Signing in with a key needs the key and the workspace: comprism login --key <key> --workspace <address>'));
+        out(ui.fail('Signing in with a key needs the key and the organization: comprism login --key <key> --organization <address>'));
         process.exitCode = 1;
         return;
     }
-    const url = workspaceUrl(typed);
+    const url = await addressOf(typed);
     const tenant = tenantFor(url, typed, flag('--tenant'));
     const { ask: askWith } = await Promise.resolve().then(() => __importStar(require('../lib/gateway')));
     const existing = (0, connection_1.readConnection)();
@@ -464,7 +534,7 @@ async function loginWithKey(key, args) {
         }, true);
     }
     catch (err) {
-        out(ui.fail(err instanceof Error ? err.message : 'the workspace address was refused'));
+        out(ui.fail(err instanceof Error ? err.message : (0, words_1.word)('addressRefused')));
         process.exitCode = 1;
         return;
     }
@@ -501,7 +571,7 @@ async function resolveWorkspace(email) {
     //
     // Working against a local server is still supported and is now something a
     // person SAYS rather than something an environment does to them:
-    // `comprism login --workspace localhost:8009`.
+    // `comprism login --organization localhost:8009`.
     // ASKED OF THE ONE SERVICE, at the product's own address.
     //
     // This used to post to the authentication route directly, which made the
@@ -511,7 +581,7 @@ async function resolveWorkspace(email) {
     const root = `https://${WORKSPACE_DOMAIN}`;
     const reply = await (0, gateway_1.askAt)(root, { intent: 'resolve_workspace', prompt: email });
     if (!reply.ok || reply.served === false || reply.complete === false) {
-        throw new Error(reply.message || 'Your workspace could not be looked up. Try again later.');
+        throw new Error(reply.message || 'Your organization could not be looked up. Try again later.');
     }
     const url = reply.session?.workspace_url;
     if (!url)

package/out/commands/permissions.js

@@ -64,7 +64,7 @@ async function cmdPermissions(args) {
         process.stderr.write(`  ${USAGE}\n`);
         return 2;
     }
-    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../lib/project')));
+    const { resolveProject, asWire } = await Promise.resolve().then(() => __importStar(require('../machine/folder/project')));
     const { currentWorkspace } = await Promise.resolve().then(() => __importStar(require('./settings')));
     const facts = resolveProject(currentWorkspace().path, []);
     const files = {};
@@ -85,7 +85,7 @@ async function cmdPermissions(args) {
     const lines = reply.permissions?.lines;
     if (!reply.ok || !Array.isArray(lines)) {
         process.stderr.write(ui.fail(reply.served === false
-            ? 'Your workspace is running a build without permission answers yet.'
+            ? 'Your organization is running a build without permission answers yet.'
             : (0, sessions_1.failure)(reply)) + '\n');
         return (0, sessions_1.exitFor)(reply);
     }

package/out/commands/plugins.js

@@ -48,7 +48,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const readline = __importStar(require("readline"));
 const gateway_1 = require("../lib/gateway");
-const project_1 = require("../lib/project");
+const project_1 = require("../machine/folder/project");
 const ui = __importStar(require("../lib/ui"));
 const out = (s = "") => process.stdout.write(`${s}\n`);
 const MAX_FILES = 200;
@@ -81,7 +81,7 @@ async function call(payload) {
     const reply = await (0, gateway_1.ask)({ intent: "plugins", prompt: "", pluginsPayload: payload });
     const body = reply.plugins;
     if (!reply.ok || reply.served === false || !body) {
-        out(`  ${ui.fail(reply.message || "Your plugins could not be read from your workspace.")}`);
+        out(`  ${ui.fail(reply.message || "Your plugins could not be read from your organization.")}`);
         return null;
     }
     if (body.error) {
@@ -136,7 +136,7 @@ async function cmdPlugins(args) {
             out(`  ${l}`);
         let scope = args.indexOf("--scope") >= 0 ? args[args.indexOf("--scope") + 1] : undefined;
         if (!scope) {
-            const said = await question(`  Install for: 1 this project  2 just me  3 cancel  `);
+            const said = await question(`  Install for: 1 this workspace  2 just me  3 cancel  `);
             scope = said === "1" ? "project" : said === "2" ? "personal" : undefined;
             if (!scope) {
                 out("  Nothing was installed.");

package/out/commands/privacy.js

@@ -45,8 +45,8 @@ async function cmdPrivacy() {
     const reply = await (0, gateway_1.ask)({ intent: "privacy", prompt: "" });
     if (!reply.ok || reply.served === false) {
         out(ui.fail(reply.served === false
-            ? "Your workspace is running an older build that does not answer this yet."
-            : `Your workspace could not be reached: ${reply.message || "no answer"}`));
+            ? "Your organization is running an older build that does not answer this yet."
+            : `Your organization could not be reached: ${reply.message || "no answer"}`));
         return 1;
     }
     out();

package/out/commands/repl.d.ts

@@ -4,5 +4,9 @@ export interface Opening {
     latest?: boolean;
     resume?: string;
     pick?: boolean;
+    /** Set once signing in has been offered, so it is never offered twice. */
+    noSignIn?: boolean;
+    /** The mark is already on screen (signing in drew it). */
+    noMark?: boolean;
 }
 export declare function runRepl(how?: Opening): Promise<void>;