Merge pull request #1491 from Hirobreak/missing-filekeys

danieltigse · web-flow · commit 68c44576cdac · 2020-07-15T14:38:48.000-05:00
passing header and filekeys as well if email not encrypted
diff --git a/email_mailbox/src/libs/signal.js b/email_mailbox/src/libs/signal.js
@@ -38,7 +38,11 @@ const decryptEmail = async ({
     throw new Error(CONTENT_NOT_AVAILABLE);
   }
   if (typeof deviceId !== 'number' && typeof messageType !== 'number') {
-    return { decryptedBody: body.body };
+    return {
+      decryptedBody: body.body,
+      decryptedHeaders: body.headers,
+      decryptedFileKeys: fileKeys
+    };
   }
   const res = await aliceRequestWrapper(() => {
     return fetchDecryptBody({

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ const decryptEmail = async ({`
`38`	`38`	`throw new Error(CONTENT_NOT_AVAILABLE);`
`39`	`39`	`}`
`40`	`40`	`if (typeof deviceId !== 'number' && typeof messageType !== 'number') {`
`41`		`- return { decryptedBody: body.body };`
	`41`	`+ return {`
	`42`	`+ decryptedBody: body.body,`
	`43`	`+ decryptedHeaders: body.headers,`
	`44`	`+ decryptedFileKeys: fileKeys`
	`45`	`+ };`
`42`	`46`	`}`
`43`	`47`	`const res = await aliceRequestWrapper(() => {`
`44`	`48`	`return fetchDecryptBody({`