nukebase 2.0.1 → 2.0.2

package/lib/login.js

@@ -31,7 +31,13 @@ function page(mark, title, message, accent) {
 }
 
 // A one-shot server on 127.0.0.1 for the browser to come back to. Resolves
-// with the callback's query once one arrives carrying the right state.
+// with { query, reply } once a callback arrives carrying the right state.
+// The browser's request is held open until the caller calls reply(), so the
+// browser only lands on "signed in" once the CLI really has its token:
+//   reply({ redirect })   send the browser on (the dashboard)
+//   reply({ error })      show what went wrong
+//   reply()               a plain "signed in, close this tab" page
+// If reply() never comes, the page is sent after 30 seconds anyway.
 function startLoopback(state) {
   return new Promise((resolveStart, rejectStart) => {
     let finish;
@@ -44,14 +50,30 @@ function startLoopback(state) {
         res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
         return res.end(page('✕', 'Sign-in error', 'This sign-in could not be verified. Return to your terminal and try again.', '#dc2626'));
       }
-      const denied = q.error === 'access_denied';
-      res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
-      res.end(denied
-        ? page('✕', 'Cancelled', 'The CLI was not signed in. You can close this tab.', '#64748b')
-        : page('✓', 'CLI signed in', 'You can close this tab and return to your terminal.', '#16a34a'));
       clearTimeout(timer);
       server.close();
-      finish.res(q);
+      if (q.error === 'access_denied') {
+        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+        res.end(page('✕', 'Cancelled', 'The CLI was not signed in. You can close this tab.', '#64748b'));
+        return finish.res({ query: q, reply: () => {} });
+      }
+      let sent = false;
+      const reply = ({ redirect, error } = {}) => {
+        if (sent) return;
+        sent = true;
+        clearTimeout(fallback);
+        if (redirect) {
+          res.writeHead(302, { Location: redirect });
+          return res.end();
+        }
+        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+        res.end(error
+          ? page('✕', 'Sign-in failed', `${String(error).replace(/[<>&"]/g, '')} Return to your terminal.`, '#dc2626')
+          : page('✓', 'CLI signed in', 'You can close this tab and return to your terminal.', '#16a34a'));
+      };
+      const fallback = setTimeout(() => reply(), 30 * 1000);
+      fallback.unref();
+      finish.res({ query: q, reply });
     });
     const timer = setTimeout(() => { server.close(); finish.rej(new Error('No response within 5 minutes. Run nukebase login again.')); }, LOGIN_TIMEOUT_MS);
     server.on('error', rejectStart);
@@ -104,13 +126,20 @@ async function browser(api, { email } = {}) {
     console.log(`\n  Still waiting. No account yet? Sign up at ${api}/start.html first, then run this again.`);
   }, 90 * 1000);
   hint.unref();
-  const q = await result.finally(() => clearTimeout(hint));
+  const { query: q, reply } = await result.finally(() => clearTimeout(hint));
   if (q.error) throw new Error('Sign-in was cancelled in the browser.');
-  if (!q.code) throw new Error('The browser did not return a sign-in code.');
-  const r = await postJson(`${api}/cli/token`, { code: q.code, verifier });
-  needsNewerServer(r, api);
-  if (!r.ok) throw new Error(r.data.error || `Sign-in failed (${r.status})`);
-  return r.data;
+  try {
+    if (!q.code) throw new Error('The browser did not return a sign-in code.');
+    const r = await postJson(`${api}/cli/token`, { code: q.code, verifier });
+    needsNewerServer(r, api);
+    if (!r.ok) throw new Error(r.data.error || `Sign-in failed (${r.status})`);
+    // Signed in: finish the browser on the dashboard, which says so.
+    reply({ redirect: `${api}/?cli=signed-in` });
+    return r.data;
+  } catch (e) {
+    reply({ error: e.message });
+    throw e;
+  }
 }
 
 async function device(api) {
@@ -156,9 +185,18 @@ async function emailLink(api, email) {
   console.log(`\n  ✉  Sign-in link sent to ${email} (if it has a NukeBase account).`);
   console.log('     Open it in a browser on this computer.');
   console.log('\n  Waiting for the link to be clicked…  (expires in 5 minutes)');
-  const q = await result;
-  if (!q.uid || !q.token) throw new Error('The sign-in link did not return a session.');
-  return exchange(api, q.uid, q.token);
+  // This browser has no dashboard session (the link signed in the CLI, not
+  // the browser), so it gets the plain "signed in" page rather than a redirect.
+  const { query: q, reply } = await result;
+  try {
+    if (!q.uid || !q.token) throw new Error('The sign-in link did not return a session.');
+    const out = await exchange(api, q.uid, q.token);
+    reply();
+    return out;
+  } catch (e) {
+    reply({ error: e.message });
+    throw e;
+  }
 }
 
 async function password(api, username, pass) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nukebase",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "NukeBase CLI: create, deploy and manage NukeBase projects",
   "bin": {
     "nukebase": "bin/nukebase.js"