bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-09 21:20:27 +00:00
Code Issues Releases Wiki Activity

updated to use sdk function without prociding the key

Browse Source
This commit is contained in:
gbubemismith
2025-04-16 16:22:09 -04:00
parent c4c2f9a915
commit 55a701befd
36 changed files with 118 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/cli/src/admin-console/commands/share.command.ts
View File

@@ -59,14 +59,11 @@ export class ShareCommand {
return Response.badRequest("This item already belongs to an organization.");
}
const cipherView = await this.cipherService.decryptCipherWithSdkOrLegacy(cipher, activeUserId);
const cipherView = await this.cipherService.decrypt(cipher, activeUserId);
try {
await this.cipherService.shareWithServer(cipherView, organizationId, req, activeUserId);
const updatedCipher = await this.cipherService.get(cipher.id, activeUserId);
const decCipher = await this.cipherService.decryptCipherWithSdkOrLegacy(
updatedCipher,
activeUserId,
);
const decCipher = await this.cipherService.decrypt(updatedCipher, activeUserId);
const res = new CipherResponse(decCipher);
return Response.success(res);
} catch (e) {

12
apps/cli/src/commands/edit.command.ts
View File

@@ -90,7 +90,7 @@ export class EditCommand {
return Response.notFound();
}
let cipherView = await this.cipherService.decryptCipherWithSdkOrLegacy(cipher, activeUserId);
let cipherView = await this.cipherService.decrypt(cipher, activeUserId);
if (cipherView.isDeleted) {
return Response.badRequest("You may not edit a deleted item. Use the restore command first.");
}
@@ -98,10 +98,7 @@ export class EditCommand {
const encCipher = await this.cipherService.encrypt(cipherView, activeUserId);
try {
const updatedCipher = await this.cipherService.updateWithServer(encCipher);
const decCipher = await this.cipherService.decryptCipherWithSdkOrLegacy(
updatedCipher,
activeUserId,
);
const decCipher = await this.cipherService.decrypt(updatedCipher, activeUserId);
const res = new CipherResponse(decCipher);
return Response.success(res);
} catch (e) {
@@ -131,10 +128,7 @@ export class EditCommand {
cipher,
activeUserId,
);
const decCipher = await this.cipherService.decryptCipherWithSdkOrLegacy(
updatedCipher,
activeUserId,
);
const decCipher = await this.cipherService.decrypt(updatedCipher, activeUserId);
const res = new CipherResponse(decCipher);
return Response.success(res);
} catch (e) {

2
apps/cli/src/commands/get.command.ts
View File

@@ -116,7 +116,7 @@ export class GetCommand extends DownloadCommand {
if (Utils.isGuid(id)) {
const cipher = await this.cipherService.get(id, activeUserId);
if (cipher != null) {
decCipher = await this.cipherService.decryptCipherWithSdkOrLegacy(cipher, activeUserId);
decCipher = await this.cipherService.decrypt(cipher, activeUserId);
}
} else if (id.trim() !== "") {
let ciphers = await this.cipherService.getAllDecrypted(activeUserId);

10
apps/cli/src/vault/create.command.ts
View File

@@ -93,10 +93,7 @@ export class CreateCommand {
const cipher = await this.cipherService.encrypt(CipherExport.toView(req), activeUserId);
try {
const newCipher = await this.cipherService.createWithServer(cipher);
const decCipher = await this.cipherService.decryptCipherWithSdkOrLegacy(
newCipher,
activeUserId,
);
const decCipher = await this.cipherService.decrypt(newCipher, activeUserId);
const res = new CipherResponse(decCipher);
return Response.success(res);
} catch (e) {
@@ -163,10 +160,7 @@ export class CreateCommand {
new Uint8Array(fileBuf).buffer,
activeUserId,
);
const decCipher = await this.cipherService.decryptCipherWithSdkOrLegacy(
updatedCipher,
activeUserId,
);
const decCipher = await this.cipherService.decrypt(updatedCipher, activeUserId);
return Response.success(new CipherResponse(decCipher));
} catch (e) {
return Response.error(e);