Przeglądaj źródła

omit string-to-boolean

Shun Miyazawa 3 lat temu
rodzic
commit
34f2c228c9

+ 3 - 4
packages/app/src/server/routes/apiv3/users.js

@@ -1,6 +1,5 @@
 import Activity from '~/server/models/activity';
 import loggerFactory from '~/utils/logger';
-import { stringToBoolean } from '~/utils/string-to-boolean';
 
 import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
 
@@ -949,21 +948,21 @@ module.exports = (crowi) => {
     try {
       const data = {};
 
-      if (stringToBoolean(req.query.isIncludeActiveUsernames)) {
+      if (req.query.isIncludeActiveUsernames === 'true') {
         const additionalQuery = { status: User.STATUS_ACTIVE };
         const activeUsers = await User.findUserByUsernameRegex(q, limit, additionalQuery);
         const activeUsernames = activeUsers.map(user => user.username);
         Object.assign(data, { activeUsernames });
       }
 
-      if (stringToBoolean(req.query.isIncludeInactiveUsernames)) {
+      if (req.query.isIncludeInactiveUsernames === 'true') {
         const additionalQuery = { status: { $nin: [User.STATUS_ACTIVE, User.STATUS_DELETED] } };
         const inactiveUsers = await User.findUserByUsernameRegex(q, limit, additionalQuery);
         const inactiveUsernames = inactiveUsers.map(user => user.username);
         Object.assign(data, { inactiveUsernames });
       }
 
-      if (stringToBoolean(req.query.isIncludeActivitySnapshotUsernames) && req.user.admin) {
+      if (req.query.isIncludeActivitySnapshotUsernames === 'true' && req.user.admin) {
         const activitySnapshotUsernames = await Activity.getSnapshotUsernames(q, limit);
         Object.assign(data, { activitySnapshotUsernames });
       }

+ 0 - 13
packages/app/src/utils/string-to-boolean.ts

@@ -1,13 +0,0 @@
-// 'true' => true
-// otherwise => false
-export const stringToBoolean = (text: string): boolean => {
-  if (text == null) {
-    return false;
-  }
-
-  if (text === 'true') {
-    return true;
-  }
-
-  return false;
-};