shepherd-onboard 0.1.17 → 0.1.19

package/bin/shepherd-onboard.js

@@ -824,6 +824,8 @@ Domain-wide delegation OAuth Client ID: ${payload.googleWorkspaceDelegation.clie
 Scopes:
 ${payload.googleWorkspaceDelegation.scopes.join("\n")}
 
+The setup command copies those scopes to the clipboard as one comma-separated string on macOS. Tell the user they can paste directly into the OAuth scopes field. If clipboard copy is unavailable, use the scopes printed above.
+
 The customer does not create a service account and does not upload service account JSON in the default Shepherd-managed flow. Their super admin only authorizes the Client ID and scopes in Google Admin Console. Shepherd's backend stores and uses its private service account JSON server-side.
 Shepherd must still enforce selected users and groups internally before polling or impersonating any employee email.
 
@@ -918,15 +920,34 @@ function googleWorkspaceDelegationSetup(setup) {
 
 function printGoogleWorkspaceDelegationSetup(setup) {
   const resolved = googleWorkspaceDelegationSetup(setup);
+  const copiedScopes = copyTextToClipboard(resolved.scopes.join(","));
   console.log(`App name: ${resolved.appName}`);
   console.log(`Service account email: ${resolved.serviceAccountEmail}`);
   console.log(`Domain-wide delegation OAuth Client ID: ${resolved.clientId}`);
   console.log("Customer action: in Google Admin Console, add the Client ID above and paste these scopes.");
   console.log("Customers do not create a service account or upload service account JSON; Shepherd stores its private service account JSON server-side.");
+  if (copiedScopes) {
+    console.log("Copied comma-separated scopes to the clipboard.");
+  } else if (platform() === "darwin") {
+    console.log("Could not copy scopes to the clipboard; copy the scopes below instead.");
+  }
   console.log("\nScopes:");
   for (const scope of resolved.scopes) console.log(scope);
 }
 
+function copyTextToClipboard(text) {
+  if (platform() !== "darwin") return false;
+  try {
+    execFileSync("pbcopy", [], {
+      input: text,
+      stdio: ["pipe", "ignore", "ignore"],
+    });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function authenticatedEmail(authenticated) {
   return authenticated?.workosUser?.email ?? authenticated?.account?.email ?? null;
 }
@@ -1238,12 +1259,20 @@ async function selectChatsInBrowser(chats, opts = {}) {
   const token = Math.random().toString(36).slice(2) + Math.random().toString(36).slice(2);
   let settled = false;
   let server;
+  const sockets = new Set();
 
   return new Promise((resolve, reject) => {
+    const closeSelectorServer = () => {
+      server?.close();
+      server?.closeIdleConnections?.();
+      for (const socket of sockets) socket.destroy();
+      sockets.clear();
+    };
+
     const timeout = setTimeout(() => {
       if (settled) return;
       settled = true;
-      server?.close();
+      closeSelectorServer();
       reject(new Error("Messages chat selection timed out."));
     }, 20 * 60 * 1000);
 
@@ -1271,11 +1300,11 @@ async function selectChatsInBrowser(chats, opts = {}) {
             return;
           }
 
+          if (!settled) res.once("finish", closeSelectorServer);
           sendHtml(res, renderMessagesDonePage(`${selected.length} chat${selected.length === 1 ? "" : "s"} selected.`));
           if (!settled) {
             settled = true;
             clearTimeout(timeout);
-            setTimeout(() => server.close(), 100);
             resolve(selected);
           }
           return;
@@ -1286,16 +1315,22 @@ async function selectChatsInBrowser(chats, opts = {}) {
         if (!settled) {
           settled = true;
           clearTimeout(timeout);
-          server?.close();
+          closeSelectorServer();
           reject(err);
         }
       }
     });
 
+    server.on("connection", (socket) => {
+      sockets.add(socket);
+      socket.once("close", () => sockets.delete(socket));
+    });
+
     server.on("error", (err) => {
       if (settled) return;
       settled = true;
       clearTimeout(timeout);
+      closeSelectorServer();
       reject(err);
     });
 
@@ -1305,7 +1340,7 @@ async function selectChatsInBrowser(chats, opts = {}) {
       if (!port) {
         settled = true;
         clearTimeout(timeout);
-        server.close();
+        closeSelectorServer();
         reject(new Error("Could not start local Messages selector."));
         return;
       }
@@ -1621,6 +1656,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     const search = document.getElementById("search");
     const empty = document.getElementById("empty");
     const selected = document.getElementById("selection-count");
+    const form = document.querySelector("form");
     const checks = Array.from(document.querySelectorAll('input[name="chatId"]'));
 
     function updateRows() {
@@ -1642,6 +1678,11 @@ function renderMessagesSelectorPage(chats, token, error = "") {
     }
 
     search.addEventListener("input", updateRows);
+    document.addEventListener("keydown", (event) => {
+      if (event.key !== "Enter") return;
+      event.preventDefault();
+      form.requestSubmit();
+    });
     for (const check of checks) check.addEventListener("change", updateSelected);
     updateRows();
     updateSelected();
@@ -1651,6 +1692,7 @@ function renderMessagesSelectorPage(chats, token, error = "") {
 }
 
 function renderMessagesDonePage(message, isError = false) {
+  const closeScript = isError ? "" : "<script>setTimeout(() => window.close(), 150);</script>";
   return `<!doctype html>
 <html lang="en">
 <head>
@@ -1671,8 +1713,9 @@ function renderMessagesDonePage(message, isError = false) {
   <main>
     <div class="mark">${isError ? "!" : "OK"}</div>
     <h1>${html(message)}</h1>
-    <p>${isError ? "Return to the terminal and retry." : "You can close this tab and return to the terminal."}</p>
+    <p>${isError ? "Return to the terminal and retry." : "Returning to the terminal."}</p>
   </main>
+  ${closeScript}
 </body>
 </html>`;
 }
@@ -1739,6 +1782,7 @@ function sendHtml(res, body, status = 200) {
   res.writeHead(status, {
     "Content-Type": "text/html; charset=utf-8",
     "Cache-Control": "no-store",
+    "Connection": "close",
   });
   res.end(body);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shepherd-onboard",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "Customer-facing Shepherd raw sync onboarding CLI",
   "type": "module",
   "bin": {