itizawa 6 лет назад
Родитель
Сommit
d407c569a5
2 измененных файлов с 7 добавлено и 5 удалено
  1. 4 2
      src/server/models/user.js
  2. 3 3
      src/server/routes/admin.js

+ 4 - 2
src/server/models/user.js

@@ -612,14 +612,16 @@ module.exports = function(crowi) {
     return newPassword;
   };
 
-  userSchema.statics.createUsersByInvitation = function(emailList, toSendEmail, callback) {
+  userSchema.statics.createUsersByInvitation = function(emailList, toSendEmail) {
     validateCrowi();
 
     const configManager = crowi.configManager;
 
     const User = this;
     const createdUserList = [];
-    const mailer = crowi.getMailer();
+
+    // TODO 切り分け
+    // const mailer = crowi.getMailer();
 
     if (!Array.isArray(emailList)) {
       debug('emailList is not array');

+ 3 - 3
src/server/routes/admin.js

@@ -454,12 +454,12 @@ module.exports = function(crowi, app) {
       return res.json(ApiResponse.error('Valid email address is required'));
     }
 
-    // const array = req.body.emailInputValue.split('\n');
-    // const emailList = array.filter((element) => { return element.match(/.+@.+\..+/) });
+    const array = req.body.emailInputValue.split('\n');
+    const emailList = array.filter((element) => { return element.match(/.+@.+\..+/) });
 
     try {
       // TODO GW-170 Create users based on mail list passed in array
-      // await User.createUsersByInvitation(req.body.emailList.split('\n'), req.body.sendEmail);
+      await User.createUsersByInvitation(emailList, req.body.sendEmail);
       return res.json(ApiResponse.success());
     }
     catch (err) {