fixed recovery domain to be supportive of custom domains

Telios-org · Jan 8, 2023 · 8fd1d71 · 8fd1d71
1 parent 2c58a91
commit 8fd1d71
Show file tree

Hide file tree

Showing 10 changed files with 523 additions and 251 deletions.
diff --git a/app/login_window/routes/recovery/Recovery.tsx b/app/login_window/routes/recovery/Recovery.tsx
@@ -59,11 +59,15 @@ const Recovery = () => {
           value: true,
           message: 'Required field.'
         },
+        pattern: {
+          value: externalEmailRE,
+          message: 'Invalid email address'
+        },
         custom: {
           isValid: async (value, data) => {
-            const val = `${value}@${mailDomain}`;
-            const mailboxes = await mailbox.getMailboxPubKeys([val]);
-            if (mailboxes[val]) {
+            // const val = `${value}@${mailDomain}`;
+            const mailboxes = await mailbox.getMailboxPubKeys([value]);
+            if (mailboxes[value]) {
               return true;
             }
             return false;
@@ -159,9 +163,7 @@ const Recovery = () => {
               value={data.accountEmail}
               error={errors.accountEmail}
               onChange={handleAccountChange}
-              addonPosition="right"
-              addonLabel={`@${mailDomain}`}
-              className="text-right"
+              activityPosition="right"
               isValid={
                 errors.accountEmail === '' || errors.accountEmail === undefined
               }

diff --git a/app/main_window/actions/account/account.ts b/app/main_window/actions/account/account.ts
@@ -133,7 +133,6 @@ export const updatePlan = (payload: { accountId: string; plan: string }) => {
   };
 };
 
-
 /*
  *  This action is to retrieve the Account stats from the server and store them locally for use in the Settings Page.
  */
@@ -183,8 +182,7 @@ export const retrieveStats = () => {
       result = await AccountService.retrieveStats();
       if (plan !== result.plan) {
         dispatch(updatePlan({ accountId, plan: result.plan }));
-      };
-
+      }
     } catch (error) {
       dispatch(retrieveStatsFailure(error));
       return {
@@ -232,13 +230,16 @@ export const updateAccountPasswordFailure = (error: Error) => {
 export const updateAccountPassword = (payload: {
   email: string;
   newPass: string;
+  mailboxId: string;
 }) => {
   return async (dispatch: Dispatch) => {
     dispatch(updateAccountPasswordRequest(payload));
-    let result;
 
     try {
-      const results = await AccountService.updateAccountPassword(payload);
+      await AccountService.updateAccountPassword({
+        email: payload.email,
+        newPass: payload.newPass
+      });
     } catch (error) {
       dispatch(updateAccountPasswordFailure(error));
       return {
@@ -250,6 +251,6 @@ export const updateAccountPassword = (payload: {
 
     dispatch(updateAccountPasswordSuccess(payload));
 
-    return { status: 'updateed', success: true };
+    return { status: 'updated', success: true };
   };
 };
diff --git a/app/main_window/actions/domains/domains.ts b/app/main_window/actions/domains/domains.ts
@@ -278,3 +278,51 @@ export const updateMailbox = payload => {
     return result;
   };
 };
+
+/*
+ * Resend invitation to a claimable mailbox.
+ */
+export const RESEND_MAILBOX_INVITE_REQUEST =
+  'DOMAIN::RESEND_MAILBOX_INVITE_REQUEST';
+export const resendMailboxInviteRequest = () => {
+  return {
+    type: RESEND_MAILBOX_INVITE_REQUEST
+  };
+};
+
+export const RESEND_MAILBOX_INVITE_SUCCESS =
+  'DOMAIN::RESEND_MAILBOX_INVITE_SUCCESS';
+export const resendMailboxInviteSuccess = () => {
+  return {
+    type: RESEND_MAILBOX_INVITE_SUCCESS
+  };
+};
+
+export const RESEND_MAILBOX_INVITE_FAILURE =
+  'DOMAIN::RESEND_MAILBOX_INVITE_FAILURE';
+export const resendMailboxInviteFailure = (error: Error) => {
+  return {
+    type: RESEND_MAILBOX_INVITE_FAILURE,
+    error
+  };
+};
+
+export const resendMailboxInvite = (payload: {
+  addr: string;
+  password: string;
+  inviteEmail: string;
+}) => {
+  return async (dispatch: Dispatch) => {
+    dispatch(resendMailboxInviteRequest());
+    try {
+      await DomainService.resendMailboxInvitation(payload);
+    } catch (error) {
+      dispatch(resendMailboxInviteFailure(error));
+      return { status: error.message, success: false };
+    }
+
+    dispatch(resendMailboxInviteSuccess());
+
+    return { status: 'invitation-sent', success: true };
+  };
+};