allow original cipher to be passed during encrypt

bitwarden · Aug 15, 2018 · f16fc58 · f16fc58
1 parent d56c5ff
commit f16fc58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/abstractions/cipher.service.ts b/src/abstractions/cipher.service.ts
@@ -14,7 +14,7 @@ export abstract class CipherService {
     decryptedCipherCache: CipherView[];
 
     clearCache: () => void;
-    encrypt: (model: CipherView, key?: SymmetricCryptoKey) => Promise<Cipher>;
+    encrypt: (model: CipherView, key?: SymmetricCryptoKey, originalCipher?: Cipher) => Promise<Cipher>;
     encryptFields: (fieldsModel: FieldView[], key: SymmetricCryptoKey) => Promise<Field[]>;
     encryptField: (fieldModel: FieldView, key: SymmetricCryptoKey) => Promise<Field>;
     get: (id: string) => Promise<Cipher>;

diff --git a/src/services/cipher.service.ts b/src/services/cipher.service.ts
@@ -80,11 +80,14 @@ export class CipherService implements CipherServiceAbstraction {
         this.decryptedCipherCache = null;
     }
 
-    async encrypt(model: CipherView, key?: SymmetricCryptoKey): Promise<Cipher> {
+    async encrypt(model: CipherView, key?: SymmetricCryptoKey, originalCipher: Cipher = null): Promise<Cipher> {
         // Adjust password history
         if (model.id != null) {
-            const existingCipher = await (await this.get(model.id)).decrypt();
-            if (existingCipher != null) {
+            if (originalCipher == null) {
+                originalCipher = await this.get(model.id);
+            }
+            if (originalCipher != null) {
+                const existingCipher = await originalCipher.decrypt();
                 model.passwordHistory = existingCipher.passwordHistory || [];
                 if (model.type === CipherType.Login && existingCipher.type === CipherType.Login) {
                     if (existingCipher.login.password != null && existingCipher.login.password !== '' &&