@illuminis/comprism 0.1.4 → 0.1.5

package/out/commands/login.js

@@ -234,14 +234,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('--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,11 +275,12 @@ 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('--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('--workspace')) || Boolean(again && last?.typed);
     if (!typedWorkspace) {
         const live = new ui.LiveIndicator();
         live.start('finding your workspace');
@@ -292,7 +319,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();
@@ -357,6 +388,10 @@ 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')}`);
@@ -420,14 +455,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;

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>;