bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-28 02:23:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into EC-598-beeep-properly-store-passkeys-in-bitwarden

Browse Source
This commit is contained in:
Todd Martin
2023-09-28 12:18:34 -04:00
parent ad9d9e432a 58cd35ef76
commit bd48aa11dc
300 changed files with 2905 additions and 1442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/common/src/models/export/cipher.export.ts
View File

@@ -88,6 +88,7 @@ export class CipherExport {
domain.notes = req.notes != null ? new EncString(req.notes) : null;
domain.favorite = req.favorite;
domain.reprompt = req.reprompt ?? CipherRepromptType.None;
domain.key = req.key != null ? new EncString(req.key) : null;
if (req.fields != null) {
domain.fields = req.fields.map((f) => FieldExport.toDomain(f));
@@ -135,6 +136,7 @@ export class CipherExport {
revisionDate: Date = null;
creationDate: Date = null;
deletedDate: Date = null;
key: string;
// Use build method instead of ctor so that we can control order of JSON stringify for pretty print
build(o: CipherView | CipherDomain) {
@@ -149,6 +151,7 @@ export class CipherExport {
} else {
this.name = o.name?.encryptedString;
this.notes = o.notes?.encryptedString;
this.key = o.key?.encryptedString;
}
this.favorite = o.favorite;