Merge pull request #1475 from javiteri95/newRecoveryEmailValidations

New recovery email validations

Author: javiteri95

electron_app/electron-starter.js

@@ -101,6 +101,14 @@ async function initApp() {
     composerWindowManager.sendEventToMailbox('failed-to-send', undefined);
   });
 
+  ipcMain.on('send-recovery-email', () => {
+    composerWindowManager.sendEventToMailbox('send-recovery-email', undefined)
+  })
+
+  ipcMain.on('open-recovery-email-mailbox', (ev,params) => {
+    composerWindowManager.sendEventToMailbox('open-recovery-email-mailbox', params)
+  })
+
   // Socket
   socketClient.setMessageListener(async data => {
     const { cmd, recipientId, domain } = data;

electron_app/package.json

@@ -150,7 +150,7 @@
     "electron-notarize": "^0.1.1"
   },
   "dependencies": {
-    "@criptext/api": "^0.15.35",
+    "@criptext/api": "^0.15.37",
     "@criptext/data-transfer-client": "^0.1.1",
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
     "@criptext/electron-push-receiver": "^2.1.3",

electron_app/src/clientManager.js

@@ -200,6 +200,15 @@ const canLogin = async ({ username, domain }) => {
   return await client.canLogin({ username, domain });
 };
 
+const canSend = async params => {
+  const { recipientId } = params;
+  const client = await createClient({ recipientId });
+  const res = await client.canSend();
+  return res.status === 200
+    ? res
+    : await checkExpiredSession(res, canSend, params);
+};
+
 const changeRecoveryEmail = async params => {
   const { recipientId } = params;
   const client = await createClient({ recipientId });
@@ -754,6 +763,7 @@ module.exports = {
   activateAddress,
   acknowledgeEvents,
   canLogin,
+  canSend,
   blockRemoteContent,
   changePassword,
   changeRecoveryEmail,

electron_app/src/globalManager.js

@@ -6,6 +6,7 @@ global.composerData = {};
 global.emailToEdit = {};
 global.isMAS = INSTALLER_TYPE === allInstallerTypes.mac.store;
 global.loadingData = {};
+global.loginData = {};
 global.pinData = {};
 global.temporalAccount = {};
 global.windowsEventsDisabled = false;
@@ -60,6 +61,15 @@ const getLoadingData = () => {
   return global.loadingData;
 };
 
+/*  Login
+----------------------------- */
+const setLoginData = data => {
+  global.loginData = data;
+};
+const getLoginData = () => {
+  return global.loginData;
+};
+
 /*  Pin
 ----------------------------- */
 const setPinData = data => {
@@ -172,6 +182,10 @@ module.exports = {
     get: getLoadingData,
     set: setLoadingData
   },
+  loginData: {
+    get: getLoginData,
+    set: setLoginData
+  },
   pinData: {
     get: getPinData,
     set: setPinData

electron_app/src/ipc/client.js

@@ -15,6 +15,13 @@ ipc.answerRenderer('client-can-login', ({ username, domain }) =>
   clientManager.canLogin({ username, domain })
 );
 
+ipc.answerRenderer('client-can-send', params => {
+  const recipientId =
+    params && params.recipientId ? params.recipientId : myAccount.recipientId;
+  const data = { recipientId };
+  return clientManager.canSend(data);
+});
+
 ipc.answerRenderer('client-change-password', params => {
   const data = { ...params, recipientId: myAccount.recipientId };
   return clientManager.changePassword(data);
@@ -178,8 +185,10 @@ ipc.answerRenderer('client-report-phishing', params => {
   return clientManager.reportPhishing(data);
 });
 
-ipc.answerRenderer('client-resend-confirmation-email', () => {
-  return clientManager.resendConfirmationEmail(myAccount.recipientId);
+ipc.answerRenderer('client-resend-confirmation-email', params => {
+  const recipientId =
+    params && params.recipientId ? params.recipientId : myAccount.recipientId;
+  return clientManager.resendConfirmationEmail(recipientId);
 });
 
 ipc.answerRenderer('client-reset-password', params =>

electron_app/src/ipc/login.js

@@ -1,5 +1,6 @@
 const { ipcMain: ipc } = require('@criptext/electron-better-ipc');
 const loginWindow = require('../windows/login');
+const globalManager = require('../globalManager');
 const { checkForUpdates } = require('./../updater');
 const { openUpgradeToPlusWindow } = require('../windows/upgradePlus');
 
@@ -11,7 +12,8 @@ ipc.answerRenderer('minimize-login', () => {
   loginWindow.minimize();
 });
 
-ipc.answerRenderer('open-login', () => {
+ipc.answerRenderer('open-login', params => {
+  if (params) globalManager.loginData.set(params);
   loginWindow.show();
 });
 

electron_app/src/ipc/mailbox.js

@@ -38,6 +38,10 @@ ipc.answerRenderer('maximize-mailbox', () => {
   mailboxWindow.toggleMaximize();
 });
 
+ipc.answerRenderer('focus-mailbox', () => {
+  mailboxWindow.focus();
+});
+
 ipc.answerRenderer('minimize-mailbox', () => {
   mailboxWindow.minimize();
 });

electron_app/src/windows/mailbox.js

@@ -129,6 +129,12 @@ const show = async ({ firstOpenApp = false }) => {
   }
 };
 
+const focus = () => {
+  if (mailboxWindow && mailboxWindow.focus) {
+    mailboxWindow.focus();
+  }
+};
+
 const hide = () => {
   if (mailboxWindow && mailboxWindow.hide) {
     mailboxWindow.hide();
@@ -200,6 +206,7 @@ function getWindow() {
 module.exports = {
   close,
   hide,
+  focus,
   getShowPreview,
   getWindow,
   send,

electron_app/yarn.lock

@@ -115,10 +115,10 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@criptext/api@^0.15.35":
-  version "0.15.35"
-  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.15.35.tgz#634e40d1437fbf212681708e67690cf3d0e75e4e"
-  integrity sha512-bxBYBv/wbghu8p/OcmtnvTkEdBgU7XsnkifR0yq4ZoTspAMfp4GN6KXE8t/8PTmwxH9xQpktc1B+44NlXER1KQ==
+"@criptext/api@^0.15.37":
+  version "0.15.37"
+  resolved "https://registry.yarnpkg.com/@criptext/api/-/api-0.15.37.tgz#9cfed4e381a80d57adb8bba56946a27490685449"
+  integrity sha512-kHR8vBdKYd+NCUxkLUURiJIyl2dwAj1/XR4OnWHd6aIrm3ZUUBp9WXHrFRD879NOvQPHUSBt5bbn5qU/PKZdfw==
   dependencies:
     superagent "^3.8.2"
 

email_composer/src/components/Composer.js

@@ -7,8 +7,14 @@ import BodyWrapper from './BodyWrapper';
 import NonCriptextPopupWrapper from './NonCriptextPopupWrapper';
 import { Status } from './Control';
 import { mySettings } from '../utils/electronInterface';
+import PopupHOC from './PopupHOC';
+import NotVerifiedRecoveryEmailPopup from '../components/NotVerifiedRecoveryEmailPopup';
+import RecoveryEmailSentPopup from '../components/RecoveryEmailSentPopup';
 import './composer.scss';
 
+const NotverifiedrecoveryemailPopup = PopupHOC(NotVerifiedRecoveryEmailPopup);
+const Recoveryemailsentpopup = PopupHOC(RecoveryEmailSentPopup);
+
 const Composer = props => (
   <div className="wrapper" data-theme={mySettings.theme || 'light'}>
     <FromWrapper
@@ -64,6 +70,21 @@ const Composer = props => (
         }
       />
     )}
+    {props.displayNotVerifiedRecoveryEmailPopup && (
+      <NotverifiedrecoveryemailPopup
+        popupPosition={{ left: '45%', top: '45%' }}
+        onConfirmVerifyRecoveryEmail={props.handleConfirmVerifyRecoveryEmail}
+        onTogglePopup={props.onTogglePopupNotVerifiedRecoveryEmail}
+        theme={'dark'}
+      />
+    )}
+    {props.displayRecoveryEmailSentPopup && (
+      <Recoveryemailsentpopup
+        popupPosition={{ left: '45%', top: '45%' }}
+        onTogglePopup={props.onToggleRecoveryEmailSentPopup}
+        theme={'dark'}
+      />
+    )}
     {(props.status === Status.WAITING ||
       props.status === Status.INITIALIZING ||
       props.isLinkingDevices) && <div className="composer-disable" />}
@@ -79,13 +100,16 @@ Composer.propTypes = {
   ccEmails: PropTypes.array,
   disableSendButtonOnInvalidEmail: PropTypes.func,
   displayNonCriptextPopup: PropTypes.bool,
+  displayNotVerifiedRecoveryEmailPopup: PropTypes.bool,
+  displayRecoveryEmailSentPopup: PropTypes.bool,
   files: PropTypes.array,
   getAccount: PropTypes.func,
   getBccEmails: PropTypes.func,
   getCcEmails: PropTypes.func,
   getHtmlBody: PropTypes.func,
   getTextSubject: PropTypes.func,
   getToEmails: PropTypes.func,
+  handleConfirmVerifyRecoveryEmail: PropTypes.func,
   handlePauseUploadFile: PropTypes.func,
   handleResumeUploadFile: PropTypes.func,
   htmlBody: PropTypes.string,
@@ -103,7 +127,9 @@ Composer.propTypes = {
   onClickSendMessage: PropTypes.func,
   onDragOver: PropTypes.func,
   onSetNonCriptextRecipientsPassword: PropTypes.func,
+  onTogglePopupNotVerifiedRecoveryEmail: PropTypes.func,
   onToggleRecipient: PropTypes.func,
+  onToggleRecoveryEmailSentPopup: PropTypes.func,
   status: PropTypes.number,
   tagBlured: PropTypes.func,
   tagChanged: PropTypes.func,