Clean up code in org controller

kernelsmith · Feb 17, 2023 · 1b71b34 · 1b71b34
1 parent 4475197
commit 1b71b34
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/controller/org.controller/index.js b/src/controller/org.controller/index.js
@@ -630,7 +630,7 @@ router.get('/org/:shortname/user/:username',
   */
   mw.validateUser,
   param(['shortname']).isString().trim().escape().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }),
-  param(['username']).isString().trim().escape().notEmpty().custom(val => { return isValidUsername(val) }),
+  param(['username']).isString().trim().escape().notEmpty().custom(isValidUsername),
   parseError,
   parseGetParams,
   controller.USER_SINGLE)
@@ -718,9 +718,9 @@ router.put('/org/:shortname/user/:username',
       'name.suffix', 'active_roles.add', 'active_roles.remove'])
   }),
   param(['shortname']).isString().trim().escape().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }),
-  param(['username']).isString().trim().escape().notEmpty().custom(val => { return isValidUsername(val) }),
+  param(['username']).isString().trim().escape().notEmpty().custom(isValidUsername),
   query(['active']).optional().isBoolean({ loose: true }),
-  query(['new_username']).optional().isString().trim().escape().notEmpty().custom(val => { return isValidUsername(val) }),
+  query(['new_username']).optional().isString().trim().escape().notEmpty().custom(isValidUsername),
   query(['org_short_name']).optional().isString().trim().escape().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }),
   query(['name.first']).optional().isString().trim().escape(),
   query(['name.last']).optional().isString().trim().escape(),
@@ -808,7 +808,7 @@ router.put('/org/:shortname/user/:username/reset_secret',
   mw.validateUser,
   mw.onlyOrgWithRole,
   param(['shortname']).isString().trim().escape().notEmpty().isLength({ min: CONSTANTS.MIN_SHORTNAME_LENGTH, max: CONSTANTS.MAX_SHORTNAME_LENGTH }),
-  param(['username']).isString().trim().escape().notEmpty().custom(val => { return isValidUsername(val) }),
+  param(['username']).isString().trim().escape().notEmpty().custom(isValidUsername),
   parseError,
   parsePostParams,
   controller.USER_RESET_SECRET)