parsing address in what i believe a simpler way

Author: Pedro Aim

electron_app/src/database/DBEmanager.js

@@ -1478,23 +1478,37 @@ const updateCustomDomain = ({ id, name, validated, accountId }) => {
 };
 
 const getCustomDomainByParams = params => {
-  return CustomDomain().findAll({ where: params });
+  return CustomDomain()
+    .findAll({ where: params })
+    .then(domains => {
+      return domains.map(domain => domain.toJSON());
+    });
 };
 
 const deleteCustomDomainByName = ({ name, accountId }) => {
-  return CustomDomain().destroy({
-    where: {
-      name,
-      accountId
-    }
+  return getDB().transaction(async trx => {
+    await CustomDomain().destroy({
+      where: {
+        name,
+        accountId
+      },
+      transaction: trx
+    });
+    await Alias().destroy({
+      where: {
+        domain: name,
+        accountId
+      },
+      transaction: trx
+    });
   });
 };
 
 const deleteCustomDomains = params => {
   const { domain, domains, accountId } = params;
   const theDomains = domain ? domain : domains;
   const whereParam = { name: theDomains, accountId };
-  return CustomDomain().destroy({ where: whereParam });
+  return deleteCustomDomainByName(whereParam);
 };
 
 /* Functions

electron_app/src/ipc/logger.js

@@ -0,0 +1,6 @@
+const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
+const logger = require('../logger');
+
+ipc.answerRenderer('log-error', stack => {
+  logger.error(stack);
+});

email_mailbox/src/components/AliasesWrapper.js

@@ -40,8 +40,8 @@ class AliasesWrapper extends Component {
   }
 
   async componentDidMount() {
-    const domainsRaw = await getCustomDomainByParams({});
-    const domains = domainsRaw.map(domain => domain.dataValues.name);
+    const domainsRaw = await getCustomDomainByParams({ validated: true });
+    const domains = domainsRaw.map(domain => domain.name);
     this.setState({
       domains: [appDomain, ...domains]
     });

email_mailbox/src/components/CustomDomains.js

@@ -60,6 +60,7 @@ const Step1 = props => {
           type="text"
           onChange={e => props.onChangeInputDomain(e)}
           className={props.existError ? 'input-error' : ''}
+          value={props.domain}
         />
         {inputError(props)}
       </div>
@@ -292,6 +293,7 @@ CustomDomains.propTypes = {
 };
 
 Step1.propTypes = {
+  domain: PropTypes.string,
   onChangeInputDomain: PropTypes.func,
   existError: PropTypes.bool
 };

email_mailbox/src/components/CustomDomainsWrapper.js

@@ -9,8 +9,10 @@ import {
   createCustomDomain,
   updateCustomDomain
 } from '../utils/ipc';
+import { domainRegex } from '../utils/RegexUtils';
 
 const errors = {
+  INVALID_FORMAT: string.address.add.step1.errors.invalidFormat,
   NOT_DOMAIN_AVAILABLE: string.address.add.step1.errors.usedDomain,
   UNKNOWN_DOMAIN_AVAILABLE: string.address.add.step1.errors.unknownError,
   FAILED_MX_RECORDS: string.address.add.step2_2.errors.notMXRecords,
@@ -68,7 +70,7 @@ class CustomDomainsWrapper extends Component {
 
   handleInputDomain = ev => {
     this.setState({
-      domain: ev.target.value
+      domain: ev.target.value.toLowerCase().trim()
     });
   };
 
@@ -87,8 +89,17 @@ class CustomDomainsWrapper extends Component {
   };
 
   handleDomainExistRequirement = async () => {
-    this.setState({ loadingDomain: true });
+    this.setState({ loadingDomain: true, existError: false });
     const domain = this.state.domain;
+    const isValidDomain = domainRegex.test(domain);
+    if (!isValidDomain) {
+      this.setState({
+        loadingDomain: false,
+        existError: true,
+        errorMessage: errors.INVALID_FORMAT
+      });
+      return;
+    }
     const response = await isDomainAvailable(domain);
     if (!response) {
       this.setState({

email_mailbox/src/containers/SettingsContainer.js

@@ -16,7 +16,9 @@ import {
   updateAccount,
   updateAlias,
   createAlias,
-  createCustomDomain
+  createCustomDomain,
+  updateCustomDomain,
+  logError
 } from './../utils/ipc';
 import { appDomain, SectionType } from '../utils/const';
 import { defineLastDeviceActivity } from '../utils/TimeUtils';
@@ -53,17 +55,17 @@ const formatDevicesData = devices => {
 const checkAddressesAndDomains = async addresses => {
   if (!addresses) return;
 
-  const aliasinDb = await getAlias({});
-  const customDomainsinDb = await getCustomDomain({});
+  const aliasinDb = await getAlias({ accountId: myAccount.id });
+  const customDomainsinDb = await getCustomDomain({ accountId: myAccount.id });
 
-  const aliasesInApi = addresses
+  let aliasesInApi = addresses
     .map(address => {
       const domainName = address.domain.name;
       return address.aliases.map(alias => {
         return {
           name: alias.name,
-          rowid: alias.addressId,
-          active: alias.status,
+          rowId: alias.addressId,
+          active: alias.status ? true : false,
           domain: domainName
         };
       });
@@ -72,77 +74,71 @@ const checkAddressesAndDomains = async addresses => {
   const domainsInApi = addresses
     .map(address => address.domain)
     .filter(domain => domain.name !== appDomain);
+  const domainsToCreate = [];
+  const domainsToUpdate = [];
+  const myApiDomains = new Set();
+  for (const apiDomain of domainsInApi) {
+    myApiDomains.add(apiDomain.name);
 
-  if (domainsInApi.length !== customDomainsinDb.length) {
-    if (domainsInApi.length > customDomainsinDb.length) {
-      await Promise.all(
-        domainsInApi.map(async domain => {
-          const customDomainsinDbExist = customDomainsinDb.find(
-            domainInDb => domain.name === domainInDb.name
-          );
-          if (!customDomainsinDbExist) {
-            const params = {
-              name: domain.name,
-              validated: domain.confirmed === 1
-            };
-            await createCustomDomain(params);
-          }
-        })
-      );
-    } else if (customDomainsinDb.length > domainsInApi.length) {
-      const customDomainsToDelete = customDomainsinDb
-        .filter(domain => {
-          const domainsInApiExist = domainsInApi.map(
-            domainInApi => domainInApi.name === domain.name
-          );
-          return !domainsInApiExist;
-        })
-        .map(domain => domain.name);
-      await deleteCustomDomains(customDomainsToDelete.filter(e => e));
+    const localDomain = customDomainsinDb.find(
+      domain => apiDomain.name === domain.name
+    );
+    if (!localDomain) {
+      domainsToCreate.push({
+        ...apiDomain,
+        accountId: myAccount.accountId
+      });
+    } else if (localDomain.validated !== apiDomain.confirmed) {
+      domainsToUpdate.push({
+        name: localDomain.name,
+        validated: apiDomain.confirmed,
+        accountId: myAccount.id
+      });
     }
   }
+  const domainsToDelete = customDomainsinDb
+    .filter(domain => !myApiDomains.has(domain.name))
+    .map(domain => domain.name);
 
-  if (aliasesInApi.length !== aliasinDb.length) {
-    if (aliasesInApi.length > aliasinDb.length) {
-      await Promise.all(
-        aliasesInApi.map(async aliasInApi => {
-          const aliasInDbExist = aliasinDb.find(
-            aliasInDB => aliasInDB.rowid === aliasInApi.rowid
-          );
-          if (!aliasInDbExist) {
-            const alias = {
-              rowId: aliasInApi.rowid,
-              name: aliasInApi.name,
-              domain:
-                aliasInApi.domain === appDomain ? null : aliasInApi.domain,
-              active: aliasInApi.active === 1
-            };
-            await createAlias(alias);
-          } else if (
-            aliasInDbExist &&
-            // eslint-disable-next-line eqeqeq
-            aliasInDbExist.active != aliasInApi.active
-          ) {
-            // make an update
-            await updateAlias({
-              rowId: aliasInDbExist.rowId,
-              active: !aliasInDbExist.active
-            });
-          }
-        })
-      );
-    } else if (aliasinDb.length > aliasesInApi.length) {
-      const aliasToDelete = aliasinDb
-        .filter(aliasInDB => {
-          const aliasInApiExist = aliasesInApi.find(
-            aliasInApi => aliasInApi.rowid === aliasInDB.rowId
-          );
-          return !aliasInApiExist;
-        })
-        .map(alias => alias.rowId);
-      await deleteAliases({ rowIds: aliasToDelete.filter(e => e) });
+  const aliasesToUpdate = [];
+  const aliasesToDelete = [];
+  for (const localAlias of aliasinDb) {
+    if (localAlias.domain !== appDomain && myApiDomains.has(localAlias.domain))
+      return;
+    const apiAlias = aliasesInApi.find(
+      alias => localAlias.rowId === alias.rowId
+    );
+    if (!apiAlias) {
+      aliasesToDelete.push(localAlias.rowId);
+    } else if (localAlias.active !== apiAlias.active) {
+      aliasesToUpdate.push({
+        rowId: localAlias.rowId,
+        active: apiAlias.active,
+        accountId: myAccount.id
+      });
     }
+    aliasesInApi = aliasesInApi.filter(
+      alias => alias.rowId !== localAlias.rowId
+    );
   }
+  const aliasesToCreate = aliasesInApi.map(alias => ({
+    ...alias,
+    domain: alias.domain === appDomain ? null : alias.domain,
+    accountId: myAccount.id
+  }));
+
+  await Promise.all(
+    [
+      domainsToCreate.map(createCustomDomain),
+      domainsToUpdate.map(updateCustomDomain),
+      domainsToDelete.length > 0 ? deleteCustomDomains(domainsToDelete) : [],
+      aliasesToCreate.map(createAlias),
+      aliasesToUpdate.map(updateAlias),
+      aliasesToDelete.length > 0
+        ? deleteAliases({ rowIds: aliasesToDelete, accountId: myAccount.id })
+        : []
+    ].flat()
+  );
 };
 
 const deleteDeviceData = async (onUpdateApp, onClickSection) => {
@@ -190,7 +186,11 @@ const mapDispatchToProps = (dispatch, ownProps) => {
         dispatch(reloadAccounts());
       }
 
-      await checkAddressesAndDomains(addresses); //syncro
+      try {
+        await checkAddressesAndDomains(addresses);
+      } catch (ex) {
+        logError(ex.stack);
+      }
 
       const aliases = addresses.reduce((result, domainWithAliases) => {
         const myAliases = domainWithAliases.aliases.map(alias => {

email_mailbox/src/lang/de.json

@@ -23,6 +23,7 @@
         "title": "Let's set up your domain",
         "text": "Enter the custom domain you wish to add.",
         "errors": {
+          "invalidFormat": "This is not a valid domain. Note: do NOT add 'http' or 'www' when entering your domain.",
           "usedDomain": "This domain is already in use",
           "unknownError": "Server error. Try again later."
         }

email_mailbox/src/lang/en.json

@@ -23,6 +23,7 @@
         "title": "Let's set up your domain",
         "text": "Enter the custom domain you wish to add.",
         "errors": {
+          "invalidFormat": "This is not a valid domain. Note: do NOT add 'http' or 'www' when entering your domain.",
           "usedDomain": "This domain is already in use",
           "unknownError": "Server error. Try again later."
         }

email_mailbox/src/lang/es.json

@@ -23,6 +23,7 @@
         "title": "Configuremos tu dominio",
         "text": "Ingresa el dominio personal que quisieras agregar.",
         "errors": {
+          "invalidFormat": "Dominio inválido. Nota: NO agregue 'http' o 'www' al escribir su dominio.",
           "usedDomain": "Este dominio ya está en uso",
           "unknownError": "Error de servidor. Prueba despúes."
         }

email_mailbox/src/lang/fr.json

@@ -23,6 +23,7 @@
         "title": "Let's set up your domain",
         "text": "Enter the custom domain you wish to add.",
         "errors": {
+          "invalidFormat": "This is not a valid domain. Note: do NOT add 'http' or 'www' when entering your domain.",
           "usedDomain": "This domain is already in use",
           "unknownError": "Server error. Try again later."
         }