minor bug fixes

Author: danieltigse

electron_app/src/database/DBEexporter.js

@@ -88,7 +88,7 @@ const exportNotEncryptDatabaseToFile = async ({ databasePath, outputPath }) => {
   saveToFile({ data: labels, filepath, mode: 'a' });
 
   let userEmail;
-  if (myAccount.recipientId) {
+  if (myAccount && myAccount.recipientId) {
     userEmail = myAccount.email;
   } else {
     const firstAccount = accountsData.firstAccount;
@@ -263,7 +263,7 @@ const _exportEmailTable = async (db, userEmail) => {
     );
 
     emailRows = [...emailRows, ...result];
-    if (rows.length < SELECT_ALL_BATCH) {
+    if (result.length < SELECT_ALL_BATCH) {
       shouldEnd = true;
     } else {
       offset += SELECT_ALL_BATCH;
@@ -641,7 +641,7 @@ const exportEmailTable = async accountId => {
         );
       });
     emailRows = [...emailRows, ...result];
-    if (emailRows.length < SELECT_ALL_BATCH) {
+    if (result.length < SELECT_ALL_BATCH) {
       shouldEnd = true;
     } else {
       offset += SELECT_ALL_BATCH;

email_mailbox/src/libs/signal.js

@@ -34,7 +34,9 @@ const decryptEmail = async ({
   accountRecipientId
 }) => {
   const { status, body } = await fetchEmailBody({ bodyKey, optionalToken });
-  if (status !== 200) return;
+  if (status !== 200) {
+    throw new Error(CONTENT_NOT_AVAILABLE);
+  }
   if (typeof deviceId !== 'number' && typeof messageType !== 'number') {
     return { decryptedBody: body.body };
   }
@@ -51,10 +53,12 @@ const decryptEmail = async ({
       fileKeys: fileKeys
     });
   });
+
   if (!res) {
     throw new Error(ALICE_ERROR);
   } else if (res.status === 500) {
-    throw new Error(CONTENT_UNENCRYPTED);
+    const aliceError = await res.text();
+    throw new Error(`${CONTENT_UNENCRYPTED} - ${aliceError}`);
   } else if (res.status === 409) {
     throw new Error(DUPLICATE_MESSAGE);
   } else if (res.status !== 200) {

email_mailbox/src/utils/FetchUtils.js

@@ -7,6 +7,7 @@ const PENDING_EVENTS_STATUS_MORE = 201;
 const NO_EVENTS_STATUS = 204;
 const EVENTS_BATCH = 25;
 const NOT_FOUND = 404;
+const EXPIRED_SESSION = 401;
 
 export const fetchEmailBody = async ({ bodyKey, optionalToken }) => {
   const res = await apiCriptextRequest({
@@ -19,16 +20,16 @@ export const fetchEmailBody = async ({ bodyKey, optionalToken }) => {
       const jsonRes = await res.json();
       return { status: STATUS_OK, body: jsonRes };
     }
-    case NOT_FOUND: {
-      throw new Error(signal.CONTENT_NOT_AVAILABLE);
-    }
-    default: {
+    case EXPIRED_SESSION: {
       return await checkExpiredSession({
         response: { status: res.status },
         initialRequest: fetchEmailBody,
         requestParams: { bodyKey, optionalToken }
       });
     }
+    default: {
+      throw new Error(signal.CONTENT_NOT_AVAILABLE);
+    }
   }
 };
 
@@ -38,15 +39,22 @@ export const fetchEventAction = async ({ cmd, action, optionalToken }) => {
     method: 'GET',
     optionalToken
   });
-  if (res.status === STATUS_OK) {
-    const jsonRes = await res.json();
-    return { status: STATUS_OK, body: jsonRes };
+  switch (res.status) {
+    case STATUS_OK: {
+      const jsonRes = await res.json();
+      return { status: STATUS_OK, body: jsonRes };
+    }
+    case EXPIRED_SESSION: {
+      return await checkExpiredSession({
+        response: { status: res.status },
+        initialRequest: fetchEventAction,
+        requestParams: { cmd, action, optionalToken }
+      });
+    }
+    default: {
+      return { status: res.status };
+    }
   }
-  return await checkExpiredSession({
-    response: { status: res.status },
-    initialRequest: fetchEventAction,
-    requestParams: { cmd, action, optionalToken }
-  });
 };
 
 /* eslint no-empty: ["error", { "allowEmptyCatch": true }] */
@@ -86,13 +94,16 @@ export const fetchEvents = async optionalToken => {
     }
     case NO_EVENTS_STATUS:
       return { status: STATUS_OK, body: { events: [] } };
-    default: {
+    case EXPIRED_SESSION: {
       return await checkExpiredSession({
         response: { status: res.status },
         initialRequest: fetchEvents,
         requestParams: optionalToken
       });
     }
+    default: {
+      return { status: res.status };
+    }
   }
 };
 
@@ -103,14 +114,21 @@ export const fetchAcknowledgeEvents = async ({ eventIds, optionalToken }) => {
     params: { ids: eventIds },
     optionalToken
   });
-  if (res.status === STATUS_OK) {
-    return { status: STATUS_OK };
+  switch (res.status) {
+    case STATUS_OK: {
+      return { status: STATUS_OK };
+    }
+    case EXPIRED_SESSION: {
+      return await checkExpiredSession({
+        response: { status: res.status },
+        initialRequest: fetchAcknowledgeEvents,
+        requestParams: { eventIds, optionalToken }
+      });
+    }
+    default: {
+      return { status: res.status };
+    }
   }
-  return await checkExpiredSession({
-    response: { status: res.status },
-    initialRequest: fetchAcknowledgeEvents,
-    requestParams: { eventIds, optionalToken }
-  });
 };
 
 export const fetchGetSingleEvent = async ({ rowId, optionalToken }) => {
@@ -132,12 +150,15 @@ export const fetchGetSingleEvent = async ({ rowId, optionalToken }) => {
     case NO_EVENTS_STATUS:
     case NOT_FOUND:
       return { status: res.status };
-    default: {
+    case EXPIRED_SESSION: {
       return await checkExpiredSession({
         response: { status: res.status },
         initialRequest: fetchGetSingleEvent,
         requestParams: { rowId, optionalToken }
       });
     }
+    default: {
+      return { status: res.status };
+    }
   }
 };

email_mailbox/src/utils/electronEventInterface.js

@@ -596,7 +596,8 @@ const formEmailIfNotExists = async params => {
   } catch (e) {
     if (
       e.message === signal.ALICE_ERROR ||
-      e.message === signal.CONTENT_NOT_AVAILABLE
+      e.message === signal.CONTENT_NOT_AVAILABLE ||
+      e instanceof TypeError
     ) {
       return {
         error: 1