bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 21:33:27 +00:00
Code Issues Releases Wiki Activity

[PM-27500] update cipher.service to align with sdk types (#17147)

Browse Source
This commit is contained in:
Jason Ng
2025-10-31 14:24:31 -04:00
committed by GitHub
parent b7759abb20
commit 4908d73804
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/common/src/abstractions/api.service.ts
View File

@@ -91,7 +91,7 @@ import { CipherShareRequest } from "../vault/models/request/cipher-share.request
import { CipherRequest } from "../vault/models/request/cipher.request"; import { CipherRequest } from "../vault/models/request/cipher.request";
import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response"; import { AttachmentUploadDataResponse } from "../vault/models/response/attachment-upload-data.response";
import { AttachmentResponse } from "../vault/models/response/attachment.response"; import { AttachmentResponse } from "../vault/models/response/attachment.response";
import { CipherResponse } from "../vault/models/response/cipher.response"; import { CipherMiniResponse, CipherResponse } from "../vault/models/response/cipher.response";
import { OptionalCipherResponse } from "../vault/models/response/optional-cipher.response"; import { OptionalCipherResponse } from "../vault/models/response/optional-cipher.response";
/** /**
@@ -215,7 +215,10 @@ export abstract class ApiService {
id: string, id: string,
request: CipherCollectionsRequest, request: CipherCollectionsRequest,
): Promise<OptionalCipherResponse>; ): Promise<OptionalCipherResponse>;
abstract putCipherCollectionsAdmin(id: string, request: CipherCollectionsRequest): Promise<any>; abstract putCipherCollectionsAdmin(
id: string,
request: CipherCollectionsRequest,
): Promise<CipherMiniResponse>;
abstract postPurgeCiphers( abstract postPurgeCiphers(
request: SecretVerificationRequest, request: SecretVerificationRequest,
organizationId?: string, organizationId?: string,

5
libs/common/src/vault/models/response/cipher.response.ts
View File

@@ -14,6 +14,11 @@ import { SshKeyApi } from "../api/ssh-key.api";
import { AttachmentResponse } from "./attachment.response"; import { AttachmentResponse } from "./attachment.response";
import { PasswordHistoryResponse } from "./password-history.response"; import { PasswordHistoryResponse } from "./password-history.response";
export type CipherMiniResponse = Omit<
CipherResponse,
"edit" | "viewPassword" | "folderId" | "favorite" | "permissions"
>;
export class CipherResponse extends BaseResponse { export class CipherResponse extends BaseResponse {
id: string; id: string;
organizationId: string; organizationId: string;

8
libs/common/src/vault/services/cipher.service.ts
View File

@@ -1117,7 +1117,13 @@ export class CipherService implements CipherServiceAbstraction {
async saveCollectionsWithServerAdmin(cipher: Cipher): Promise<Cipher> { async saveCollectionsWithServerAdmin(cipher: Cipher): Promise<Cipher> {
const request = new CipherCollectionsRequest(cipher.collectionIds); const request = new CipherCollectionsRequest(cipher.collectionIds);
const response = await this.apiService.putCipherCollectionsAdmin(cipher.id, request); const response = await this.apiService.putCipherCollectionsAdmin(cipher.id, request);
const data = new CipherData(response); // The response will be incomplete with several properties missing values
// We will assign those properties values so the SDK decryption can complete
const completedResponse = new CipherResponse(response);
completedResponse.edit = true;
completedResponse.viewPassword = true;
completedResponse.favorite = false;
const data = new CipherData(completedResponse);
return new Cipher(data); return new Cipher(data);
} }