Merge pull request #1144 from JulianAdams4/opened

Push notifications on opening emails

Author: Erika Perugachi

email_mailbox/src/lang/en.json

@@ -299,10 +299,6 @@
     "atText": "at"
   },
   "notification": {
-    "newEmailGroup": {
-      "prefix": "You have ",
-      "sufix": " new emails"
-    },
     "export_backup": {
       "success": {
         "title": "Backup exported successfully!",
@@ -312,6 +308,14 @@
         "title": "Criptext",
         "message": "Oops! Something went wrong to export backup"
       }
+    },
+    "newEmailGroup": {
+      "prefix": "You have ",
+      "sufix": " new emails"
+    },
+    "openEmail": {
+      "title": "Criptext",
+      "message": "📩 Email <subject> was opened"
     }
   },
   "popups": {

email_mailbox/src/lang/es.json

@@ -299,10 +299,6 @@
     "atText": "a las"
   },
   "notification": {
-    "newEmailGroup": {
-      "prefix": "Tienes ",
-      "sufix": " correos nuevos"
-    },
     "export_backup": {
       "success": {
         "title": "Respaldo exportado exitosamente!",
@@ -312,6 +308,14 @@
         "title": "Criptext",
         "message": "Ups! Algo salió mal al crear tu archivo de respaldo"
       }
+    },
+    "newEmailGroup": {
+      "prefix": "Tienes ",
+      "sufix": " correos nuevos"
+    },
+    "openEmail": {
+      "title": "Criptext",
+      "message": "📩 El correo <subject> fue abierto"
     }
   },
   "popups": {

email_mailbox/src/utils/FetchUtils.js

@@ -143,6 +143,9 @@ export const fetchGetSingleEvent = async ({ rowId, optionalToken }) => {
     };
     return eventResponse;
   }
+  if (res.status === 404) {
+    return {};
+  }
   const expiredResponse = await checkExpiredSession({
     response: { status: res.status },
     initialRequest: fetchGetSingleEvent,

email_mailbox/src/utils/StringUtils.js

@@ -85,3 +85,11 @@ export const splitSignalIdentifier = identifier => {
   const recipientId = parts.join('.');
   return { recipientId, deviceId };
 };
+
+export const getSubjectFromPushMessage = (message, emptySubject) => {
+  const matched = message.match(/"(.*)"/);
+  if (!matched) return null;
+  const substr = matched[0];
+  if (substr === `""`) return `(${emptySubject})`;
+  return substr;
+};

email_mailbox/src/utils/const.js

@@ -122,6 +122,12 @@ export const SocketCommand = {
   REACTIVATED_ACCOUNT_EVENT: 601
 };
 
+export const NOTIFICATION_ACTIONS = {
+  ANTI_PUSH: 'anti_push',
+  NEW_EMAIL: 'open_thread',
+  OPEN_EMAIL: 'open_activity'
+};
+
 export const deviceTypes = {
   PC: 1,
   IOS: 2,

email_mailbox/src/utils/electronEventInterface.js

@@ -61,12 +61,14 @@ import {
   appDomain,
   EmailStatus,
   composerEvents,
-  EXTERNAL_RECIPIENT_ID_SERVER
+  EXTERNAL_RECIPIENT_ID_SERVER,
+  NOTIFICATION_ACTIONS
 } from './const';
 import Messages from './../data/message';
 import { MessageType } from './../components/Message';
 import { AttachItemStatus } from '../components/AttachItem';
 import { getShowEmailPreviewStatus, getUserGuideStepStatus } from './storage';
+import { getSubjectFromPushMessage } from './StringUtils';
 import {
   fetchAcknowledgeEvents,
   fetchEvents,
@@ -84,7 +86,6 @@ const {
   NOTIFICATION_SERVICE_STARTED,
   TOKEN_UPDATED
 } = remote.require('@criptext/electron-push-receiver/src/constants');
-const pushActions = ['anti_push', 'open_thread', 'open_activity'];
 const senderNotificationId = '73243261136';
 const emitter = new EventEmitter();
 let totalEmailsPending = null;
@@ -1004,6 +1005,7 @@ ipcRenderer.on('socket-message', async (ev, message) => {
   if (eventId === 400) {
     sendLoadEventsEvent({ showNotification: true });
   } else {
+    if (isGettingEvents) return;
     await parseAndDispatchEvent(message);
   }
 });
@@ -1430,21 +1432,40 @@ ipcRenderer.on(TOKEN_UPDATED, async (_, token) => {
 });
 
 ipcRenderer.on(NOTIFICATION_RECEIVED, async (_, { data }) => {
-  if (pushActions.includes(data.action) || !data.rowId) return;
-  isGettingEvents = true;
   try {
-    const eventData = await fetchGetSingleEvent({ rowId: data.rowId });
-    await parseAndStoreEventsBatch({
-      events: [eventData],
-      hasMoreEvents: false
-    });
-    sendNewEmailNotification();
-    sendLoadEventsEvent({ showNotification: true });
+    switch (data.action) {
+      case NOTIFICATION_ACTIONS.NEW_EMAIL: {
+        if (isGettingEvents) return;
+        isGettingEvents = true;
+        const eventData = await fetchGetSingleEvent({ rowId: data.rowId });
+        await parseAndDispatchEvent(eventData);
+        sendNewEmailNotification();
+        isGettingEvents = false;
+        sendLoadEventsEvent({ showNotification: true });
+        break;
+      }
+      case NOTIFICATION_ACTIONS.OPEN_EMAIL: {
+        const subject = getSubjectFromPushMessage(
+          data.body,
+          string.mailbox.empty_subject
+        );
+        if (subject) {
+          const title = string.notification.openEmail.title;
+          const message = string.notification.openEmail.message.replace(
+            '<subject>',
+            subject
+          );
+          showNotificationApp({ title, message });
+        }
+        break;
+      }
+      default:
+        break;
+    }
   } catch (firebaseNotifErr) {
     // eslint-disable-next-line no-console
     console.error(`[Firebase Error]: `, firebaseNotifErr);
   }
-  isGettingEvents = false;
 });
 
 ipcRenderer.send(START_NOTIFICATION_SERVICE, senderNotificationId);