Merge branch 'create-invite-api' into invite-multiple-people

# Conflicts:
#	src/server/routes/admin.js

src/server/routes/admin.js

@@ -439,13 +439,11 @@ module.exports = function(crowi, app) {
     });
   };
   api.validators = {};
+  actions.user.api = api;
 
-  api.validators.inviteEmail = function() {
-    const validator = [
-      check('emailList').isIn(/.+@.+\..+/).withMessage('Error. Valid email address is required'),
-    ];
-    return validator;
-  };
+  api.validators.inviteEmail = [
+    check('email').isEmail().withMessage('Error. Valid email address is required'),
+  ];
 
   actions.user.invite = async function(req, res) {
 

src/server/routes/index.js

@@ -118,7 +118,7 @@ module.exports = function(crowi, app) {
   app.post('/admin/global-notification/:id/remove', loginRequired() , adminRequired , admin.globalNotification.remove);
 
   app.get('/admin/users'                , loginRequired() , adminRequired , admin.user.index);
-  app.post('/_api/admin/user/invite'         , form.admin.userInvite ,  loginRequired() , adminRequired , csrf, admin.importer.api.validators.inviteEmail(), admin.user.invite);
+  app.post('/_api/admin/user/invite'         , form.admin.userInvite ,  loginRequired() , adminRequired , csrf, admin.user.api.validators.inviteEmail, admin.user.invite);
   app.post('/admin/user/:id/makeAdmin'  , loginRequired() , adminRequired , csrf, admin.user.makeAdmin);
   app.post('/admin/user/:id/removeFromAdmin', loginRequired() , adminRequired , admin.user.removeFromAdmin);
   app.post('/admin/user/:id/activate'   , loginRequired() , adminRequired , csrf, admin.user.activate);