124062

apps/app/src/components/Admin/Users/PasswordResetModal.jsx

@@ -39,14 +39,6 @@ class PasswordResetModal extends React.Component {
     }
   }
 
-  showToaster() {
-    toastSuccess('Copied Password');
-  }
-
-  handleEmailSent() {
-    this.setState({ isEmailSent: true });
-  }
-
   renderButtons() {
     const { t, isMailerSetup } = this.props;
     const { isEmailSent } = this.state;
@@ -69,6 +61,10 @@ class PasswordResetModal extends React.Component {
     );
   }
 
+  showToaster() {
+    toastSuccess('Copied Password');
+  }
+
   renderModalBodyBeforeReset() {
     const { t, userForPasswordResetModal } = this.props;
 
@@ -164,7 +160,6 @@ class PasswordResetModal extends React.Component {
     try {
       await apiv3Put('/users/reset-password-email', { id: userForPasswordResetModal._id, newPassword: this.state.temporaryPassword });
       this.setState({ isEmailSent: true });
-      this.handleEmailSent();
     }
     catch (err) {
       toastError(err);

apps/app/src/server/routes/apiv3/users.js

@@ -1021,6 +1021,7 @@ module.exports = (crowi) => {
       };
 
       await sendEmailByUser(userInfo);
+      return res.apiv3();
     }
     catch (err) {
       const msg = err.message;