From d83875df1839dbd9b7317b685375d18539a9c60c Mon Sep 17 00:00:00 2001 From: Julian Adams Date: Tue, 8 May 2018 18:29:57 -0500 Subject: [PATCH] Fix decrypt changes --- electron_app/src/DBManager.js | 2 +- electron_app/src/utils/consts.js | 4 ++-- email_mailbox/src/utils/EmailUtils.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/electron_app/src/DBManager.js b/electron_app/src/DBManager.js index 93e1ca3bb..e059a4238 100644 --- a/electron_app/src/DBManager.js +++ b/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); }; diff --git a/electron_app/src/utils/consts.js b/electron_app/src/utils/consts.js index 75beca288..f2130a380 100644 --- a/electron_app/src/utils/consts.js +++ b/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, diff --git a/email_mailbox/src/utils/EmailUtils.js b/email_mailbox/src/utils/EmailUtils.js index 148985973..5982c9844 100644 --- a/email_mailbox/src/utils/EmailUtils.js +++ b/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,