jam411 3 лет назад
Родитель
Сommit
c93e60cc59
1 измененных файлов с 27 добавлено и 29 удалено
  1. 27 29
      packages/app/src/server/routes/apiv3/invited.ts

+ 27 - 29
packages/app/src/server/routes/apiv3/invited.ts

@@ -18,37 +18,35 @@ module.exports = (crowi: Crowi): Router => {
       return res.apiv3({ redirectTo: '/login' });
     }
 
-    if (req.method === 'POST' && req.form.isValid) {
-      const user = req.user;
-      const invitedForm = req.form.invitedForm || {};
-      const username = invitedForm.username;
-      const name = invitedForm.name;
-      const password = invitedForm.password;
-
-      // check user upper limit
-      const isUserCountExceedsUpperLimit = await User.isUserCountExceedsUpperLimit();
-      if (isUserCountExceedsUpperLimit) {
-        return res.apiv3Err('message.can_not_activate_maximum_number_of_users', 403);
-      }
-
-      const creatable = await User.isRegisterableUsername(username);
-      if (creatable) {
-        try {
-          await user.activateInvitedUser(username, name, password);
-          return res.apiv3({ redirectTo: '/' });
-        }
-        catch (err) {
-          return res.apiv3Err('message.failed_to_activate', 403);
-        }
-      }
-      else {
-        debug('username', username);
-        return res.apiv3Err('message.unable_to_use_this_user', 403);
-      }
-    }
-    else {
+    if (!req.form.isValid) {
       return res.apiv3Err(req.form.errors, 400);
     }
+
+    const user = req.user;
+    const invitedForm = req.form.invitedForm || {};
+    const username = invitedForm.username;
+    const name = invitedForm.name;
+    const password = invitedForm.password;
+
+    // check user upper limit
+    const isUserCountExceedsUpperLimit = await User.isUserCountExceedsUpperLimit();
+    if (isUserCountExceedsUpperLimit) {
+      return res.apiv3Err('message.can_not_activate_maximum_number_of_users', 403);
+    }
+
+    const creatable = await User.isRegisterableUsername(username);
+    if (!creatable) {
+      debug('username', username);
+      return res.apiv3Err('message.unable_to_use_this_user', 403);
+    }
+
+    try {
+      await user.activateInvitedUser(username, name, password);
+      return res.apiv3({ redirectTo: '/' });
+    }
+    catch (err) {
+      return res.apiv3Err('message.failed_to_activate', 403);
+    }
   });
 
   return router;