124062 fix coflict

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

@@ -7,6 +7,7 @@ import {
   Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 
+import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 import { apiv3Put } from '~/client/util/apiv3-client';
 import { toastSuccess, toastError } from '~/client/util/toastr';
 import { useIsMailerSetup } from '~/stores/context';
@@ -19,7 +20,6 @@ class PasswordResetModal extends React.Component {
     this.state = {
       temporaryPassword: [],
       isPasswordResetDone: false,
-      isEmailSent: false,
     };
 
     this.resetPassword = this.resetPassword.bind(this);
@@ -38,6 +38,10 @@ class PasswordResetModal extends React.Component {
     }
   }
 
+  showToaster() {
+    toastSuccess('Copied Password');
+  }
+
   renderButtons() {
     const { t, isMailerSetup } = this.props;
     const { isEmailSent } = this.state;
@@ -66,10 +70,6 @@ class PasswordResetModal extends React.Component {
     );
   }
 
-  showToaster() {
-    toastSuccess('Copied Password');
-  }
-
   renderModalBodyBeforeReset() {
     const { t, userForPasswordResetModal } = this.props;
 
@@ -211,6 +211,8 @@ PasswordResetModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,
   userForPasswordResetModal: PropTypes.object,
+  onSuccessfullySentNewPasswordEmail: PropTypes.func.isRequired,
+  adminUsersContainer: PropTypes.instanceOf(AdminUsersContainer).isRequired,
 
 };
 

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

@@ -1006,13 +1006,6 @@ module.exports = (crowi) => {
    *        responses:
    *          200:
    *            description: success send new password email
-   *            content:
-   *              application/json:
-   *                schema:
-   *                  properties:
-   *                    failedToSendEmail:
-   *                      type: object
-   *                      description: email and reasons for new password email sending failure
    */
   router.put('/reset-password-email', loginRequiredStrictly, adminRequired, addActivity, async(req, res) => {
     const { id } = req.body;
@@ -1028,7 +1021,6 @@ module.exports = (crowi) => {
       };
 
       await sendEmailByUser(userInfo);
-      return res.apiv3({ user });
     }
     catch (err) {
       const msg = err.message;