Merge branch 'imprv/GW-6474-6431-update-endpoints' into feat/GW-6377-warning-toast

CHANGES.md

@@ -11,6 +11,7 @@
     * stream-to-promise
     * validator
     * ws
+    * nodemailer
 
 ## v4.2.20
 

package.json

@@ -133,7 +133,7 @@
     "mongoose-unique-validator": "^2.0.3",
     "multer": "~1.4.0",
     "multer-autoreap": "^1.0.3",
-    "nodemailer": "^6.0.0",
+    "nodemailer": "^6.6.2",
     "nodemailer-ses-transport": "~1.5.0",
     "npm-run-all": "^4.1.2",
     "openid-client": "=2.5.0",

src/server/models/user.js

@@ -574,8 +574,9 @@ module.exports = function(crowi) {
     const createdUserList = [];
     const failedToCreateUserEmailList = [];
 
-    await Promise.all(creationEmailList.map(async(email) => {
+    for (const email of creationEmailList) {
       try {
+        // eslint-disable-next-line no-await-in-loop
         const createdUser = await this.createUserByEmail(email);
         createdUserList.push(createdUser);
       }
@@ -583,10 +584,10 @@ module.exports = function(crowi) {
         logger.error(err);
         failedToCreateUserEmailList.push({
           email,
-          reason: err,
+          reason: err.message,
         });
       }
-    }));
+    }
 
     return { createdUserList, existingEmailList, failedToCreateUserEmailList };
   };

src/server/routes/apiv3/users.js

@@ -121,12 +121,11 @@ module.exports = (crowi) => {
   const sendEmailByUserList = async(userList) => {
     const { appService, mailService } = crowi;
     const appTitle = appService.getAppTitle();
-
-    const succeededToSendEmailList = [];
     const failedToSendEmailList = [];
 
-    await Promise.all(userList.map(async(user) => {
+    for (const user of userList) {
       try {
+        // eslint-disable-next-line no-await-in-loop
         await mailService.send({
           to: user.email,
           subject: `Invitation to ${appTitle}`,
@@ -138,18 +137,17 @@ module.exports = (crowi) => {
             appTitle,
           },
         });
-        succeededToSendEmailList.push(user.email);
       }
       catch (err) {
         logger.error(err);
         failedToSendEmailList.push({
           email: user.email,
-          reason: err,
+          reason: err.message,
         });
       }
-    }));
+    }
 
-    return { succeededToSendEmailList, failedToSendEmailList };
+    return { failedToSendEmailList };
   };
 
   /**

yarn.lock

@@ -10404,9 +10404,10 @@ nodemailer-ses-transport@~1.5.0:
   dependencies:
     aws-sdk "^2.2.36"
 
-nodemailer@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.0.0.tgz#d9761128771739dc87c1fdd747f569b7f135cb02"
+nodemailer@^6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.6.2.tgz#e184c9ed5bee245a3e0bcabc7255866385757114"
+  integrity sha512-YSzu7TLbI+bsjCis/TZlAXBoM4y93HhlIgo0P5oiA2ua9Z4k+E2Fod//ybIzdJxOlXGRcHIh/WaeCBehvxZb/Q==
 
 noop6@^1.0.1:
   version "1.0.8"