|
@@ -12,9 +12,8 @@ const path = require('path');
|
|
|
|
|
|
|
|
const { body, query } = require('express-validator');
|
|
const { body, query } = require('express-validator');
|
|
|
const { isEmail } = require('validator');
|
|
const { isEmail } = require('validator');
|
|
|
-const { serializeUserSecurely } = require('../../models/serializers/user-serializer');
|
|
|
|
|
-const { serializePageSecurely } = require('../../models/serializers/page-serializer');
|
|
|
|
|
|
|
|
|
|
|
|
+const { serializeUserSecurely } = require('../../models/serializers/user-serializer');
|
|
|
const ErrorV3 = require('../../models/vo/error-apiv3');
|
|
const ErrorV3 = require('../../models/vo/error-apiv3');
|
|
|
|
|
|
|
|
const PAGE_ITEMS = 50;
|
|
const PAGE_ITEMS = 50;
|
|
@@ -899,11 +898,14 @@ module.exports = (crowi) => {
|
|
|
*/
|
|
*/
|
|
|
router.get('/list', accessTokenParser, loginRequired, async(req, res) => {
|
|
router.get('/list', accessTokenParser, loginRequired, async(req, res) => {
|
|
|
const userIds = req.query.userIds || null;
|
|
const userIds = req.query.userIds || null;
|
|
|
-
|
|
|
|
|
|
|
+ const username = req.query.username || null;
|
|
|
let userFetcher;
|
|
let userFetcher;
|
|
|
if (!userIds || userIds.split(',').length <= 0) {
|
|
if (!userIds || userIds.split(',').length <= 0) {
|
|
|
userFetcher = User.findAllUsers();
|
|
userFetcher = User.findAllUsers();
|
|
|
}
|
|
}
|
|
|
|
|
+ else if (username !== null) {
|
|
|
|
|
+ userFetcher = User.find({ username: { $regex: username } });
|
|
|
|
|
+ }
|
|
|
else {
|
|
else {
|
|
|
userFetcher = User.findUsersByIds(userIds.split(','));
|
|
userFetcher = User.findUsersByIds(userIds.split(','));
|
|
|
}
|
|
}
|