Merge pull request #124 from JulianAdams4/decrypt-changes

Fix decrypt changes

Author: not-gabriel

electron_app/src/DBManager.js

@@ -559,7 +559,7 @@ const createSignedPreKeyRecord = params => {
 
 const getSignedPreKey = params => {
   return db
-    .select('signedPrivKey', 'signedPubKey')
+    .select('signedPreKeyPrivKey', 'signedPreKeyPubKey')
     .from(Table.SIGNEDPREKEYRECORD)
     .where(params);
 };

electron_app/src/utils/consts.js

@@ -1,5 +1,5 @@
-const PROD_SOCKET_URL = 'ws://54.245.42.9:3001';
-const PROD_SERVER_URL = 'http://54.245.42.9:8000';
+const PROD_SOCKET_URL = 'ws://stage.socket.criptext.com';
+const PROD_SERVER_URL = 'https://stage.mail.criptext.com';
 
 module.exports = {
   PROD_SERVER_URL,

email_mailbox/src/utils/EmailUtils.js

@@ -23,17 +23,17 @@ const formRecipients = recipientString => {
 };
 
 export const formIncomingEmailFromData = async (data, deviceId) => {
-  const bodyKey = data.bodyKey;
+  const messageId = data.messageId;
   const recipientId = getRecipientIdFromEmailAddressTag(data.from);
   const { content, preview } = await getContentMessage(
-    bodyKey,
+    messageId,
     recipientId,
     deviceId
   );
   const email = {
     key: data.metadataKey,
     threadId: data.threadId,
-    s3Key: bodyKey,
+    s3Key: messageId,
     content,
     preview,
     subject: data.subject,