@nightlybuildgroup/vault 1.6.0 → 1.7.1

package/README.md

@@ -20,6 +20,9 @@ nbg-pw setup
 
 You'll be asked for your server URL, email, API-key client id/secret, and master
 password. Credentials are verified against the server before anything is saved.
+If your account belongs to an organization, setup then offers to pick a default
+**collection** to share newly added items into (or keep them in your personal
+vault) — you can change this any time with [`nbg-pw config`](#sharing-new-items-with-an-organization-config).
 
 > Get your API key from your Vaultwarden web vault: **Settings → Security →
 > Keys → API Key** (`client_id` / `client_secret`).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlybuildgroup/vault",
-  "version": "1.6.0",
+  "version": "1.7.1",
   "description": "Store Vaultwarden/Bitwarden credentials in the macOS Keychain and read secrets back for local agents.",
   "type": "module",
   "bin": {

package/src/commands/add.js

@@ -75,9 +75,10 @@ async function resolveFolderId(bw, session, folderName) {
   return created.id;
 }
 
-async function resolveCollection(bw, session, collectionName, org) {
+// Resolves a collection given by name OR id (and an optional org name/id).
+async function resolveCollection(bw, session, collectionRef, org) {
   const collections = await bw.listCollections({ session });
-  let matches = collections.filter((c) => c.name === collectionName);
+  let matches = collections.filter((c) => c.name === collectionRef || c.id === collectionRef);
   if (org) {
     const orgs = await bw.listOrganizations({ session });
     const match = orgs.find((o) => o.id === org || o.name === org);
@@ -85,10 +86,10 @@ async function resolveCollection(bw, session, collectionName, org) {
     matches = matches.filter((c) => c.organizationId === orgId);
   }
   if (matches.length === 0) {
-    throw new Error(`no collection named "${collectionName}"${org ? ` in organization "${org}"` : ''}`);
+    throw new Error(`no collection "${collectionRef}"${org ? ` in organization "${org}"` : ''}`);
   }
   if (matches.length > 1) {
-    throw new Error(`multiple collections named "${collectionName}"; disambiguate with --organization <name|id>`);
+    throw new Error(`multiple collections named "${collectionRef}"; disambiguate with --organization <name|id>`);
   }
   return matches[0];
 }

package/src/commands/items.js

@@ -43,16 +43,16 @@ export async function runItems(args, deps) {
   let folderId;
   if (folder !== null) {
     const folders = await bw.listFolders({ session });
-    const match = folders.find((f) => f.name === folder && f.id);
-    if (!match) throw new Error(`no folder named "${folder}"`);
+    const match = folders.find((f) => f.id && (f.name === folder || f.id === folder));
+    if (!match) throw new Error(`no folder "${folder}"`);
     folderId = match.id;
   }
 
   let collectionId;
   if (collection !== null) {
     const collections = await bw.listCollections({ session });
-    const match = collections.find((c) => c.name === collection);
-    if (!match) throw new Error(`no collection named "${collection}"`);
+    const match = collections.find((c) => c.name === collection || c.id === collection);
+    if (!match) throw new Error(`no collection "${collection}"`);
     collectionId = match.id;
   }
 

package/src/commands/setup.js

@@ -15,6 +15,42 @@ export async function validateCredentials(input, deps) {
   }
 }
 
+// After credentials verify, offer to share new items into an org collection by
+// default. Returns { defaultOrganization, defaultCollection } (by name) or {}.
+// Stays optional: no orgs, a cancel, or "personal vault" all yield {}.
+export async function chooseDefaultSharing(deps) {
+  const { prompts, bw, verified } = deps;
+  const session = await bw.ensureSession(verified);
+  try {
+    const orgs = await bw.listOrganizations({ session });
+    if (!orgs || orgs.length === 0) return {};
+
+    const orgChoice = await prompts.select({
+      message: 'Default: share newly added items into an organization?',
+      options: [
+        { value: '__personal__', label: 'No — keep new items in my personal vault' },
+        ...orgs.map((o) => ({ value: o.id, label: o.name })),
+      ],
+    });
+    if (prompts.isCancel(orgChoice) || orgChoice === '__personal__') return {};
+    const org = orgs.find((o) => o.id === orgChoice);
+
+    const cols = (await bw.listCollections({ session })).filter((c) => c.organizationId === org.id);
+    if (cols.length === 0) return {};
+
+    const colChoice = await prompts.select({
+      message: `Which collection in "${org.name}"?`,
+      options: cols.map((c) => ({ value: c.id, label: c.name })),
+    });
+    if (prompts.isCancel(colChoice)) return {};
+    const col = cols.find((c) => c.id === colChoice);
+
+    return { defaultOrganization: org.name, defaultCollection: col.name };
+  } finally {
+    await bw.logout();
+  }
+}
+
 export async function runSetup(deps) {
   const { prompts, bw, keychain, buildConfig, nowIso, out } = deps;
 
@@ -74,10 +110,20 @@ export async function runSetup(deps) {
   }
   spin.stop('Credentials verified.');
 
-  const config = buildConfig(input, nowIso);
+  let sharing = {};
+  try {
+    sharing = await chooseDefaultSharing({ prompts, bw, verified: input });
+  } catch {
+    out('Skipped organization setup — set a default later with "nbg-pw config set collection <name>".\n');
+  }
+
+  const config = buildConfig({ ...input, ...sharing }, nowIso);
   await keychain.writeConfig(config);
 
-  prompts.outro('Saved to your macOS Keychain. Try:  nbg-pw status');
+  const where = sharing.defaultCollection
+    ? `New items will be shared into "${sharing.defaultCollection}".`
+    : 'New items go to your personal vault (configure sharing with "nbg-pw config set").';
+  prompts.outro(`Saved to your macOS Keychain. ${where} Try:  nbg-pw status`);
   return 0;
 }
 

package/src/config.js

@@ -45,5 +45,7 @@ export function buildConfig(input, nowIso) {
     masterPassword: input.masterPassword,
     savedAt: nowIso,
   };
+  if (input.defaultOrganization) c.defaultOrganization = input.defaultOrganization;
+  if (input.defaultCollection) c.defaultCollection = input.defaultCollection;
   return c;
 }