soumaeda 2 лет назад
Родитель
Сommit
3ff3e8d8b1

+ 1 - 1
apps/app/src/components/Admin/Users/PasswordResetModal.jsx

@@ -144,7 +144,7 @@ class PasswordResetModal extends React.Component {
         toastSuccess(msg);
         toastSuccess(msg);
       }
       }
       else {
       else {
-        const msg = { message: `email: ${failedToSendEmail.email}<br>reason: ${failedToSendEmail.reason}` };
+        const msg = { message: `email: ${failedToSendEmail.email} reason: ${failedToSendEmail.reason}` };
         toastError(msg);
         toastError(msg);
       }
       }
     }
     }

+ 4 - 2
apps/app/src/server/routes/apiv3/users.js

@@ -185,6 +185,7 @@ module.exports = (crowi) => {
   const sendEmailByUser = async(user) => {
   const sendEmailByUser = async(user) => {
     const { appService, mailService } = crowi;
     const { appService, mailService } = crowi;
     const appTitle = appService.getAppTitle();
     const appTitle = appService.getAppTitle();
+    let failedToSendNewPasswordEmail = null;
 
 
     try {
     try {
       await mailService.send({
       await mailService.send({
@@ -200,10 +201,11 @@ module.exports = (crowi) => {
       });
       });
     }
     }
     catch (err) {
     catch (err) {
-      const failedToSendNewPasswordEmail = { email: user.email, reason: err.message };
       logger.error(err);
       logger.error(err);
-      return { failedToSendNewPasswordEmail };
+      failedToSendNewPasswordEmail = { email: user.email, reason: err.message };
     }
     }
+
+    return { failedToSendNewPasswordEmail };
   };
   };
 
 
   /**
   /**