recovery email validation when composer recipient != mailbox recipient

Author: javiteri95

electron_app/electron-starter.js

@@ -105,8 +105,8 @@ async function initApp() {
     composerWindowManager.sendEventToMailbox('send-recovery-email', undefined)
   })
 
-  ipcMain.on('open-recovery-email-mailbox', () => {
-    composerWindowManager.sendEventToMailbox('open-recovery-email-mailbox', undefined)
+  ipcMain.on('open-recovery-email-mailbox', (ev,params) => {
+    composerWindowManager.sendEventToMailbox('open-recovery-email-mailbox', params)
   })
 
   // Socket

electron_app/src/ipc/client.js

@@ -15,8 +15,10 @@ ipc.answerRenderer('client-can-login', ({ username, domain }) =>
   clientManager.canLogin({ username, domain })
 );
 
-ipc.answerRenderer('client-can-send', () => {
-  const data = { recipientId: myAccount.recipientId };
+ipc.answerRenderer('client-can-send', params => {
+  const recipientId =
+    params && params.recipientId ? params.recipientId : myAccount.recipientId;
+  const data = { recipientId };
   return clientManager.canSend(data);
 });
 
@@ -183,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/composer.js

@@ -14,10 +14,6 @@ ipc.answerRenderer(
   }
 );
 
-ipc.answerRenderer('close-with-draft', composerId => {
-  composerWindowManager.closeWithDraft(composerId);
-});
-
 ipc.answerRenderer('open-empty-composer', () => {
   composerWindowManager.openNewComposer();
 });

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/composer.js

@@ -143,28 +143,6 @@ const editDraft = async emailToEdit => {
   });
 };
 
-const closeWithDraft = async composerId => {
-  const window = BrowserWindow.fromId(composerId);
-  try {
-    if (globalManager.forcequit.get() && window.saved) return;
-    if (
-      globalManager.forcequit.get() ||
-      (!window.saved && !isDraftEmpty(window.id))
-    ) {
-      const dataDraft = globalManager.composerData.get(window.id);
-      await saveDraftToDatabase(window.id, dataDraft);
-      window.saved = true;
-      globalManager.composerData.delete(window.id);
-      sendEventToMailbox('save-draft-success');
-      window.close();
-    } else {
-      globalManager.composerData.delete(window.id);
-    }
-  } catch (error) {
-    sendEventToMailbox('save-draft-failed');
-  }
-};
-
 const destroy = async ({
   composerId,
   discard,
@@ -283,7 +261,6 @@ const saveDraftToDatabase = async (composerId, data) => {
 
 module.exports = {
   destroy,
-  closeWithDraft,
   editDraft,
   saveDraftChanges,
   sendEventToMailbox,

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,

email_composer/src/components/Composer.js

@@ -9,9 +9,11 @@ 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'}>
@@ -76,6 +78,13 @@ const Composer = props => (
         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" />}
@@ -92,6 +101,7 @@ Composer.propTypes = {
   disableSendButtonOnInvalidEmail: PropTypes.func,
   displayNonCriptextPopup: PropTypes.bool,
   displayNotVerifiedRecoveryEmailPopup: PropTypes.bool,
+  displayRecoveryEmailSentPopup: PropTypes.bool,
   files: PropTypes.array,
   getAccount: PropTypes.func,
   getBccEmails: PropTypes.func,
@@ -119,6 +129,7 @@ Composer.propTypes = {
   onSetNonCriptextRecipientsPassword: PropTypes.func,
   onTogglePopupNotVerifiedRecoveryEmail: PropTypes.func,
   onToggleRecipient: PropTypes.func,
+  onToggleRecoveryEmailSentPopup: PropTypes.func,
   status: PropTypes.number,
   tagBlured: PropTypes.func,
   tagChanged: PropTypes.func,

email_composer/src/components/RecoveryEmailSentPopup.js

@@ -0,0 +1,25 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import string from './../lang';
+
+const RecoveryEmailSentPopup = props => {
+  return (
+    <div id="cptx-popup-container" className="popup-content">
+      <div className="popup-paragraph">
+        <p>{string.popups.recoveryEmailSentPopup.description}</p>
+      </div>
+      <button
+        className="button-a popup-confirm-button"
+        onClick={props.onTogglePopup}
+      >
+        <span>{string.popups.recoveryEmailSentPopup.buttons.ok}</span>
+      </button>
+    </div>
+  );
+};
+
+RecoveryEmailSentPopup.propTypes = {
+  onTogglePopup: PropTypes.func
+};
+
+export default RecoveryEmailSentPopup;

email_composer/src/components/popuphoc.scss

@@ -14,7 +14,6 @@
   z-index: 11;
   transform: translate(-50%, -50%);
   width: 286px;
-  height: 341px;
   padding: 30px;
 
   .popup-content {

email_composer/src/containers/Composer.js

@@ -13,7 +13,6 @@ import {
 import {
   canSend,
   closeComposerWindow,
-  closeWindowWithDraft,
   createEmail,
   getAlias,
   isCriptextDomain,
@@ -125,6 +124,7 @@ class ComposerWrapper extends Component {
         displayNotVerifiedRecoveryEmailPopup={
           this.state.displayNotVerifiedRecoveryEmailPopup
         }
+        displayRecoveryEmailSentPopup={this.state.displayRecoveryEmailSentPopup}
         files={this.state.files}
         getAccount={this.hangleGetAccount}
         getBccEmails={this.handleGetBccEmail}
@@ -152,6 +152,7 @@ class ComposerWrapper extends Component {
           this.handleTogglePopupNotVerifiedRecoveryEmail
         }
         onToggleRecipient={this.handleToggleRecipient}
+        onToggleRecoveryEmailSentPopup={this.handleToggleRecoveryEmailSentPopup}
         status={this.state.status}
         onSetNonCriptextRecipientsPassword={
           this.handleSetNonCriptextRecipientsPassword
@@ -393,20 +394,25 @@ class ComposerWrapper extends Component {
 
   handleConfirmVerifyRecoveryEmail = async () => {
     const recoveryEmail = this.state.recoveryEmail;
+    this.saveTemporalDraft();
     if (recoveryEmail === '') {
-      this.saveTemporalDraft();
-      sendEventToMailbox('open-recovery-email-mailbox', undefined);
+      const params = {
+        recipientId: myAccount.recipientId,
+        accountId: myAccount.id
+      };
       this.setState({
         displayNotVerifiedRecoveryEmailPopup: false
       });
-      closeWindowWithDraft();
+      sendEventToMailbox('open-recovery-email-mailbox', params);
       return;
     }
     this.setState({
       displayNotVerifiedRecoveryEmailPopup: false
     });
-    await resendConfirmationEmail();
-    sendEventToMailbox('send-recovery-email', undefined);
+    this.setState({
+      displayRecoveryEmailSentPopup: true
+    });
+    await resendConfirmationEmail({ recipientId: myAccount.recipientId });
   };
 
   handleTogglePopupNotVerifiedRecoveryEmail = () => {
@@ -415,6 +421,12 @@ class ComposerWrapper extends Component {
     });
   };
 
+  handleToggleRecoveryEmailSentPopup = () => {
+    this.setState({
+      displayRecoveryEmailSentPopup: false
+    });
+  };
+
   handleDisableSendButtonOnInvalidEmail = () => {
     this.setState(prevState => {
       if (prevState.status !== Status.DISABLED) {
@@ -773,7 +785,9 @@ class ComposerWrapper extends Component {
       });
     } else {
       this.setState({ status: Status.WAITING });
-      const { status, body } = await canSend();
+      const { status, body } = await canSend({
+        recipientId: myAccount.recipientId.split('@')[0]
+      });
 
       if (status === 405) {
         const recoveryEmail = body.data.recovery;