@nightlybuildgroup/vault 1.7.0 → 1.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nightlybuildgroup/vault",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "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];
 }
@@ -138,20 +139,20 @@ export async function runAdd(args, deps) {
 
   if (entry.folder) entry.folderId = await resolveFolderId(bw, session, entry.folder);
 
-  const created = await bw.createItem({ item: buildLoginItem(entry), session });
+  const item = buildLoginItem(entry);
 
+  // Create the item DIRECTLY in the org collection (org id + collection ids in
+  // the create payload). Creating-then-moving leaves the item in a state that
+  // the org collection listing / web vault don't show — direct create does.
   let shared = '';
   if (collectionName) {
     const col = await resolveCollection(bw, session, collectionName, organizationName);
-    await bw.moveItemToCollection({
-      itemId: created.id,
-      organizationId: col.organizationId,
-      collectionIds: [col.id],
-      session,
-    });
+    item.organizationId = col.organizationId;
+    item.collectionIds = [col.id];
     shared = ` → shared to "${col.name}"`;
   }
 
+  const created = await bw.createItem({ item, session });
   out(`Created "${created.name}" (${created.id})${shared}\n`);
   return 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;
   }