support for new attachment keys

src/models/domain/attachment.ts

@@ -1,15 +1,21 @@
 import { AttachmentData } from '../data/attachmentData';
 
+import { AttachmentView } from '../view/attachmentView';
+
 import { CipherString } from './cipherString';
 import Domain from './domainBase';
+import { SymmetricCryptoKey } from './symmetricCryptoKey';
 
-import { AttachmentView } from '../view/attachmentView';
+import { CryptoService } from '../../abstractions/crypto.service';
+
+import { Utils } from '../../misc/utils';
 
 export class Attachment extends Domain {
     id: string;
     url: string;
     size: number;
     sizeName: string;
+    key: CipherString;
     fileName: CipherString;
 
     constructor(obj?: AttachmentData, alreadyEncrypted: boolean = false) {
@@ -24,13 +30,34 @@ export class Attachment extends Domain {
             url: null,
             sizeName: null,
             fileName: null,
+            key: null,
         }, alreadyEncrypted, ['id', 'url', 'sizeName']);
     }
 
-    decrypt(orgId: string): Promise<AttachmentView> {
-        return this.decryptObj(new AttachmentView(this), {
+    async decrypt(orgId: string): Promise<AttachmentView> {
+        const view = await this.decryptObj(new AttachmentView(this), {
             fileName: null,
         }, orgId);
+
+        if (this.key != null) {
+            let cryptoService: CryptoService;
+            const containerService = (Utils.global as any).bitwardenContainerService;
+            if (containerService) {
+                cryptoService = containerService.getCryptoService();
+            } else {
+                throw new Error('global bitwardenContainerService not initialized.');
+            }
+
+            try {
+                const orgKey = await cryptoService.getOrgKey(orgId);
+                const decValue = await cryptoService.decryptToBytes(this.key, orgKey);
+                view.key = new SymmetricCryptoKey(decValue);
+            } catch (e) {
+                // TODO: error?
+            }
+        }
+
+        return view;
     }
 
     toAttachmentData(): AttachmentData {
@@ -40,6 +67,7 @@ export class Attachment extends Domain {
             url: null,
             sizeName: null,
             fileName: null,
+            key: null,
         }, ['id', 'url', 'sizeName']);
         return a;
     }