From 9c6739f40a68783664cbc8958aaf73d588a9f021 Mon Sep 17 00:00:00 2001
From: Jacob Fink <jfink@bitwarden.com>
Date: Wed, 14 Jun 2023 09:58:40 -0400
Subject: [PATCH] update account model with new keys serialization

---
 libs/common/src/platform/models/domain/account.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/common/src/platform/models/domain/account.ts b/libs/common/src/platform/models/domain/account.ts
index d68e29d9eab..fd5c3abec36 100644
--- a/libs/common/src/platform/models/domain/account.ts
+++ b/libs/common/src/platform/models/domain/account.ts
@@ -22,7 +22,7 @@ import { CollectionView } from "../../../vault/models/view/collection.view";
 import { Utils } from "../../misc/utils";
 import { ServerConfigData } from "../../models/data/server-config.data";
 
-import { EncString } from "./enc-string";
+import { EncryptedString, EncString } from "./enc-string";
 import { DeviceKey, MasterKey, SymmetricCryptoKey, UserSymKey } from "./symmetric-crypto-key";
 
 export class EncryptionPair<TEncrypted, TDecrypted> {
@@ -99,15 +99,12 @@ export class AccountData {
 }
 
 export class AccountKeys {
-  // new keys
   userSymKey?: UserSymKey;
   masterKey?: MasterKey;
   userSymKeyMasterKey?: string;
   userSymKeyAuto?: string;
   userSymKeyBiometric?: string;
-  // end new keys
-
-  //deprecated keys
+  // deprecated keys
   cryptoMasterKey?: SymmetricCryptoKey;
   cryptoMasterKeyAuto?: string;
   cryptoMasterKeyB64?: string;
@@ -117,7 +114,6 @@ export class AccountKeys {
     SymmetricCryptoKey
   >();
   // end deprecated keys
-
   deviceKey?: DeviceKey;
   organizationKeys?: EncryptionPair<
     { [orgId: string]: EncryptedOrganizationKeyData },
@@ -146,6 +142,8 @@ export class AccountKeys {
     }
 
     return Object.assign(new AccountKeys(), {
+      userSymKey: SymmetricCryptoKey.fromJSON(obj?.userSymKey),
+      masterKey: SymmetricCryptoKey.fromJSON(obj?.masterKey),
       cryptoMasterKey: SymmetricCryptoKey.fromJSON(obj?.cryptoMasterKey),
       cryptoSymmetricKey: EncryptionPair.fromJSON(
         obj?.cryptoSymmetricKey,