Merge pull request #1074 from erikaperugachi/spam

Spam

Author: Erika Perugachi

CHANGELOG.md

@@ -1,8 +1,80 @@
 # Change Log
 
-## [0.17.22](https://github.com/criptext/Criptext-Email-React-Client/tree/HEAD)
+## [0.20.0](https://github.com/criptext/Criptext-Email-React-Client/tree/HEAD)
 
-[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.17.21...HEAD)
+[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.19.1...HEAD)
+
+**Closed issues:**
+
+- Composer: Send new param \(type\) in postEmail\(\) [\#830](https://github.com/Criptext/Criptext-Email-React-Client/issues/830)
+- Composer: Detect enterprise domain to contact bubble [\#285](https://github.com/Criptext/Criptext-Email-React-Client/issues/285)
+
+**Merged pull requests:**
+
+- Domain [\#1072](https://github.com/Criptext/Criptext-Email-React-Client/pull/1072) ([erikaperugachi](https://github.com/erikaperugachi))
+- Composer: Send new param \(type\) in postEmail [\#1071](https://github.com/Criptext/Criptext-Email-React-Client/pull/1071) ([JulianAdams4](https://github.com/JulianAdams4))
+
+## [0.19.1](https://github.com/criptext/Criptext-Email-React-Client/tree/0.19.1) (2019-07-15)
+[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.17.22...0.19.1)
+
+**Implemented enhancements:**
+
+- Loading: Add color by theme [\#1047](https://github.com/Criptext/Criptext-Email-React-Client/issues/1047)
+- Mailbox Detail: Add suffix on every downloading attachment \(ever\) [\#1044](https://github.com/Criptext/Criptext-Email-React-Client/issues/1044)
+- Settings: Hidden delete account option to enterprise account [\#1036](https://github.com/Criptext/Criptext-Email-React-Client/issues/1036)
+- Composer: Add divisor line between subject and message [\#1035](https://github.com/Criptext/Criptext-Email-React-Client/issues/1035)
+- Email detail: Click to email address and open new composer [\#1033](https://github.com/Criptext/Criptext-Email-React-Client/issues/1033)
+- Composer: Edit contact tag [\#1022](https://github.com/Criptext/Criptext-Email-React-Client/issues/1022)
+- Thread item: Set visible state between check and avatar component [\#736](https://github.com/Criptext/Criptext-Email-React-Client/issues/736)
+
+**Fixed bugs:**
+
+- Email detail: Fix to open email sent from other email opened [\#1066](https://github.com/Criptext/Criptext-Email-React-Client/issues/1066)
+- Window: Fix close windows when this is fullscreen [\#1064](https://github.com/Criptext/Criptext-Email-React-Client/issues/1064)
+- Feed Item: Fix contact to external email notification [\#1053](https://github.com/Criptext/Criptext-Email-React-Client/issues/1053)
+- Login:  Fix Signing Up on  confirming another account [\#1042](https://github.com/Criptext/Criptext-Email-React-Client/issues/1042)
+- Settings: Fix enter in the signature [\#1039](https://github.com/Criptext/Criptext-Email-React-Client/issues/1039)
+- Email detail: Fix handle start download and stop download files. [\#1037](https://github.com/Criptext/Criptext-Email-React-Client/issues/1037)
+- Settings:  Fix show email preview switch [\#1027](https://github.com/Criptext/Criptext-Email-React-Client/issues/1027)
+- Settings: Fix format email to set: Reply to option [\#1023](https://github.com/Criptext/Criptext-Email-React-Client/issues/1023)
+- Mailbox: Error to select all and next deselect one thread item [\#1019](https://github.com/Criptext/Criptext-Email-React-Client/issues/1019)
+- Events: Error to handle update labels by threadId [\#1007](https://github.com/Criptext/Criptext-Email-React-Client/issues/1007)
+- Mailbox: Fix click action on changing settings tab [\#838](https://github.com/Criptext/Criptext-Email-React-Client/issues/838)
+
+**Closed issues:**
+
+- Composer: Only add app signature to external emails. [\#1067](https://github.com/Criptext/Criptext-Email-React-Client/issues/1067)
+- Thread: Scroll to bottom position when thread has been replied [\#1063](https://github.com/Criptext/Criptext-Email-React-Client/issues/1063)
+- Email detail: Add tooltip to icon secure [\#1051](https://github.com/Criptext/Criptext-Email-React-Client/issues/1051)
+- File path: Fix path to enterprise users [\#1049](https://github.com/Criptext/Criptext-Email-React-Client/issues/1049)
+- Mailbox Detail: Add secure message to user guide [\#1045](https://github.com/Criptext/Criptext-Email-React-Client/issues/1045)
+- Composer: Fix contact list position [\#1032](https://github.com/Criptext/Criptext-Email-React-Client/issues/1032)
+- Thread Item, Email detail: show icon email encrypted [\#171](https://github.com/Criptext/Criptext-Email-React-Client/issues/171)
+
+**Merged pull requests:**
+
+- Handle email [\#1068](https://github.com/Criptext/Criptext-Email-React-Client/pull/1068) ([erikaperugachi](https://github.com/erikaperugachi))
+- Scroll and fullscreen [\#1065](https://github.com/Criptext/Criptext-Email-React-Client/pull/1065) ([erikaperugachi](https://github.com/erikaperugachi))
+- Feed [\#1054](https://github.com/Criptext/Criptext-Email-React-Client/pull/1054) ([erikaperugachi](https://github.com/erikaperugachi))
+- Add tooltip to icon secure. Close \#1051 [\#1052](https://github.com/Criptext/Criptext-Email-React-Client/pull/1052) ([erikaperugachi](https://github.com/erikaperugachi))
+- Path [\#1050](https://github.com/Criptext/Criptext-Email-React-Client/pull/1050) ([erikaperugachi](https://github.com/erikaperugachi))
+- Theme [\#1048](https://github.com/Criptext/Criptext-Email-React-Client/pull/1048) ([erikaperugachi](https://github.com/erikaperugachi))
+- Attachments Suffix  &  'Secure Email' User Guide Step [\#1046](https://github.com/Criptext/Criptext-Email-React-Client/pull/1046) ([JulianAdams4](https://github.com/JulianAdams4))
+- Login: Fix Signing Up on confirming another account [\#1043](https://github.com/Criptext/Criptext-Email-React-Client/pull/1043) ([JulianAdams4](https://github.com/JulianAdams4))
+- Composer [\#1038](https://github.com/Criptext/Criptext-Email-React-Client/pull/1038) ([erikaperugachi](https://github.com/erikaperugachi))
+- Composer [\#1034](https://github.com/Criptext/Criptext-Email-React-Client/pull/1034) ([erikaperugachi](https://github.com/erikaperugachi))
+- Network [\#1031](https://github.com/Criptext/Criptext-Email-React-Client/pull/1031) ([erikaperugachi](https://github.com/erikaperugachi))
+- Fix show email preview settings. Fix \#1027 [\#1030](https://github.com/Criptext/Criptext-Email-React-Client/pull/1030) ([erikaperugachi](https://github.com/erikaperugachi))
+- Secure [\#1029](https://github.com/Criptext/Criptext-Email-React-Client/pull/1029) ([erikaperugachi](https://github.com/erikaperugachi))
+- Edit contac tag in composer. Close \#1022 [\#1026](https://github.com/Criptext/Criptext-Email-React-Client/pull/1026) ([erikaperugachi](https://github.com/erikaperugachi))
+- Fix: New password Change password on First login [\#1025](https://github.com/Criptext/Criptext-Email-React-Client/pull/1025) ([JulianAdams4](https://github.com/JulianAdams4))
+- Avatar [\#1021](https://github.com/Criptext/Criptext-Email-React-Client/pull/1021) ([erikaperugachi](https://github.com/erikaperugachi))
+- Popup settings [\#1020](https://github.com/Criptext/Criptext-Email-React-Client/pull/1020) ([erikaperugachi](https://github.com/erikaperugachi))
+- Fix update labels to thread, when emailId is repeated. Fix \#1007 [\#1018](https://github.com/Criptext/Criptext-Email-React-Client/pull/1018) ([erikaperugachi](https://github.com/erikaperugachi))
+- Props [\#726](https://github.com/Criptext/Criptext-Email-React-Client/pull/726) ([erikaperugachi](https://github.com/erikaperugachi))
+
+## [0.17.22](https://github.com/criptext/Criptext-Email-React-Client/tree/0.17.22) (2019-06-27)
+[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.17.21...0.17.22)
 
 **Implemented enhancements:**
 
@@ -18,9 +90,11 @@
 **Closed issues:**
 
 - Mailbox: Parse and Handle event: 217 [\#1013](https://github.com/Criptext/Criptext-Email-React-Client/issues/1013)
+- Composer: Don't show Criptext signature to Enterprise users [\#289](https://github.com/Criptext/Criptext-Email-React-Client/issues/289)
 
 **Merged pull requests:**
 
+- Sign [\#1017](https://github.com/Criptext/Criptext-Email-React-Client/pull/1017) ([erikaperugachi](https://github.com/erikaperugachi))
 - Handle event 207. Close \#1015 [\#1016](https://github.com/Criptext/Criptext-Email-React-Client/pull/1016) ([erikaperugachi](https://github.com/erikaperugachi))
 - Mailbox: Parse and Handle event: 217 \(Mailbox Sync\) [\#1014](https://github.com/Criptext/Criptext-Email-React-Client/pull/1014) ([JulianAdams4](https://github.com/JulianAdams4))
 - Enhancement queries to get emails. Close \#1011 [\#1012](https://github.com/Criptext/Criptext-Email-React-Client/pull/1012) ([erikaperugachi](https://github.com/erikaperugachi))

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",

electron_app/src/DBManager.js

@@ -117,18 +117,6 @@ const createContactsIfOrNotStore = async (contacts, trx) => {
   return emailAddresses;
 };
 
-const updateContactScore = (emailId, trx) => {
-  const subquery = trx
-    .table(Table.EMAIL_CONTACT)
-    .select('contactId')
-    .where('emailId', emailId)
-    .andWhere('type', '<>', EMAIL_CONTACT_TYPE_FROM);
-  return trx
-    .table(Table.CONTACT)
-    .whereIn('id', subquery)
-    .increment('score', 1);
-};
-
 const filterUniqueContacts = contacts => {
   const contactsUnique = contacts.reduce(
     (result, contact) => {
@@ -155,7 +143,7 @@ const getAllContacts = () => {
 const getContactByEmails = (emails, trx) => {
   const knex = trx || db;
   return knex
-    .select('id', 'email', 'score')
+    .select('id', 'email', 'score', 'spamScore')
     .from(Table.CONTACT)
     .whereIn('email', emails);
 };
@@ -199,6 +187,38 @@ const updateContactByEmail = ({ email, name }, trx) => {
     .update({ name });
 };
 
+const updateContactScore = (emailId, trx) => {
+  const subquery = trx
+    .table(Table.EMAIL_CONTACT)
+    .select('contactId')
+    .where('emailId', emailId)
+    .andWhere('type', '<>', EMAIL_CONTACT_TYPE_FROM);
+  return trx
+    .table(Table.CONTACT)
+    .whereIn('id', subquery)
+    .increment('score', 1);
+};
+
+const updateContactSpamScore = ({ emailIds, notEmailAddress, value }) => {
+  return db
+    .table(Table.EMAIL_CONTACT)
+    .select(
+      db.raw(
+        `GROUP_CONCAT(DISTINCT(${Table.EMAIL_CONTACT}.contactId)) as contactIds`
+      )
+    )
+    .whereIn('emailId', emailIds)
+    .andWhere('type', EMAIL_CONTACT_TYPE_FROM)
+    .then(result => {
+      const contactIds = result[0].contactIds.split(',');
+      return db
+        .table(Table.CONTACT)
+        .whereNot('email', notEmailAddress)
+        .whereIn('id', contactIds)
+        .update({ spamScore: db.raw(`spamScore + ${value}`) });
+    });
+};
+
 /* EmailContact
 ----------------------------- */
 const createEmailContact = (emailContacts, trx) => {
@@ -226,8 +246,8 @@ const createEmailLabel = (emailLabels, prevTrx) => {
   });
 };
 
-const deleteEmailLabel = ({ emailsId, labelIds }, prevTrx) => {
-  const emailLabels = emailsId.map(item => {
+const deleteEmailLabel = ({ emailIds, labelIds }, prevTrx) => {
+  const emailLabels = emailIds.map(item => {
     return {
       emailId: item,
       labelId: labelIds[0]
@@ -239,7 +259,7 @@ const deleteEmailLabel = ({ emailsId, labelIds }, prevTrx) => {
     return await trx
       .table(Table.EMAIL_LABEL)
       .whereIn('labelId', labelIds)
-      .whereIn('emailId', emailsId)
+      .whereIn('emailId', emailIds)
       .del();
   });
 };
@@ -977,9 +997,9 @@ const deleteLabelById = id => {
       .select('*')
       .from(Table.EMAIL_LABEL)
       .where('labelId', id);
-    const emailsId = emailLabels.map(item => item.emailId);
-    if (emailsId.length) {
-      await deleteEmailLabel({ emailsId, labelId: id }, trx);
+    const emailIds = emailLabels.map(item => item.emailId);
+    if (emailIds.length) {
+      await deleteEmailLabel({ emailIds, labelId: id }, trx);
     }
     return trx
       .table(Table.LABEL)
@@ -1341,6 +1361,7 @@ module.exports = {
   getFilesByTokens,
   updateAccount,
   updateContactByEmail,
+  updateContactSpamScore,
   updateEmail,
   updateEmails,
   updateFeedItems,

electron_app/src/__integrations__/DbExporter.integration.js

@@ -177,9 +177,9 @@ describe('Parse database: ', () => {
   it('Should parse Contacts to string', async () => {
     await insertContacts(contacts);
     const expectedString =
-      `{"table":"contact","object":{"id":1,"email":"[email protected]","name":"Alice","isTrusted":false}}\n` +
-      `{"table":"contact","object":{"id":2,"email":"[email protected]","name":"Bob","isTrusted":false}}\n` +
-      `{"table":"contact","object":{"id":3,"email":"[email protected]","name":"Charlie","isTrusted":false}}`;
+      `{"table":"contact","object":{"id":1,"email":"[email protected]","name":"Alice","isTrusted":false,"spamScore":0}}\n` +
+      `{"table":"contact","object":{"id":2,"email":"[email protected]","name":"Bob","isTrusted":false,"spamScore":0}}\n` +
+      `{"table":"contact","object":{"id":3,"email":"[email protected]","name":"Charlie","isTrusted":false,"spamScore":0}}`;
     const contactsString = await exportContactTable(dbConnection);
     expect(contactsString).toBe(expectedString);
   });

electron_app/src/__integrations__/parsed_sample_file.txt

@@ -1,6 +1,6 @@
-{"table":"contact","object":{"id":1,"email":"[email protected]","name":"Alice","isTrusted":false}}
-{"table":"contact","object":{"id":2,"email":"[email protected]","name":"Bob","isTrusted":false}}
-{"table":"contact","object":{"id":3,"email":"[email protected]","name":"Charlie","isTrusted":false}}
+{"table":"contact","object":{"id":1,"email":"[email protected]","name":"Alice","isTrusted":false,"spamScore":0}}
+{"table":"contact","object":{"id":2,"email":"[email protected]","name":"Bob","isTrusted":false,"spamScore":0}}
+{"table":"contact","object":{"id":3,"email":"[email protected]","name":"Charlie","isTrusted":false,"spamScore":0}}
 {"table":"label","object":{"id":1,"text":"Sent","color":"000000","type":"custom","visible":true,"uuid":"00000000-0000-0000-0000-000000000001"}}
 {"table":"label","object":{"id":2,"text":"Starred","color":"111111","type":"custom","visible":true,"uuid":"00000000-0000-0000-0000-000000000002"}}
 {"table":"email","object":{"id":1,"key":1,"threadId":"threadA","s3Key":"s3KeyA","subject":"Greetings","content":"<p>Hello there</p>","preview":"Hello there","date":"2013-10-07 08:23:19","status":2,"unread":false,"secure":true,"isMuted":false,"messageId":"messageId1","fromAddress":"Alice <[email protected]>","replyTo":"","unsentDate":"2018-06-14 08:23:20"}}

electron_app/src/ipc/database.js

@@ -179,6 +179,10 @@ ipc.answerRenderer('db-update-contact-by-email', ({ email, name }) =>
   dbManager.updateContactByEmail({ email, name })
 );
 
+ipc.answerRenderer('db-update-contact-spam-acore', params =>
+  dbManager.updateContactSpamScore(params)
+);
+
 ipc.answerRenderer('db-update-email', params => dbManager.updateEmail(params));
 
 ipc.answerRenderer('db-update-emails', params =>

electron_app/src/migrations/20190716160808_spamfilter.js

@@ -0,0 +1,35 @@
+const { Table } = require('./../models');
+
+const SPAM_SCORE_COLUMN = 'spamScore';
+
+const createSpamScoreColumn = async knex => {
+  const columnExists = await knex.schema.hasColumn(
+    Table.CONTACT,
+    SPAM_SCORE_COLUMN
+  );
+  if (!columnExists)
+    await knex.schema.table(Table.CONTACT, table => {
+      table.integer(SPAM_SCORE_COLUMN).default(0);
+    });
+};
+
+const deleteSpamScoreColumn = async knex => {
+  const columnExists = await knex.schema.hasColumn(
+    Table.CONTACT,
+    SPAM_SCORE_COLUMN
+  );
+  if (columnExists)
+    await knex.schema.table(Table.CONTACT, table => {
+      table.dropColumn(SPAM_SCORE_COLUMN);
+    });
+};
+
+exports.up = async function(knex, Promise) {
+  const addColumn = createSpamScoreColumn(knex);
+  return await Promise.all([addColumn]);
+};
+
+exports.down = async function(knex, Promise) {
+  const dropColumn = deleteSpamScoreColumn(knex);
+  return await Promise.all([dropColumn]);
+};

electron_app/src/utils/const.js

@@ -2,7 +2,7 @@
 require('dotenv').config();
 
 const API_CLIENT_VERSION = '9.0.0';
-const LINK_DEVICES_FILE_VERSION = '3';
+const LINK_DEVICES_FILE_VERSION = '4';
 const PROD_SOCKET_URL = 'wss://socket.criptext.com';
 const PROD_SERVER_URL = 'https://api.criptext.com';
 const PROD_DATA_TRANSFER_URL = 'https://transfer.criptext.com';

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",

email_mailbox/src/actions/threads.js

@@ -573,7 +573,7 @@ const formAddThreadLabelParams = (emails, labelId) => {
 
 const formRemoveThreadLabelParams = (emails, labelId) => {
   return {
-    emailsId: emails.map(email => email.id),
+    emailIds: emails.map(email => email.id),
     labelIds: [labelId]
   };
 };