adjust check exist

src/server/routes/apiv3/security-setting.js

@@ -12,17 +12,17 @@ const removeNullPropertyFromObject = require('../../../lib/util/removeNullProper
 
 const validator = {
   generalSetting: [
-    body('restrictGuestMode').isString().isIn([
+    body('restrictGuestMode').if(value => value != null).isString().isIn([
       'Deny', 'Readonly',
     ]),
-    body('pageCompleteDeletionAuthority').if((value, { req }) => req.body.pageCompleteDeletionAuthority).isString().isIn([
+    body('pageCompleteDeletionAuthority').if(value => value != null).isString().isIn([
       'anyOne', 'adminOnly', 'adminAndAuthor',
     ]),
-    body('hideRestrictedByOwner').if((value, { req }) => req.body.hideRestrictedByOwner).isBoolean(),
-    body('hideRestrictedByGroup').if((value, { req }) => req.body.hideRestrictedByGroup).isBoolean(),
+    body('hideRestrictedByOwner').if(value => value != null).isBoolean(),
+    body('hideRestrictedByGroup').if(value => value != null).isBoolean(),
   ],
   authenticationSetting: [
-    body('isEnabled').if((value, { req }) => req.body.isEnabled).isBoolean(),
+    body('isEnabled').if(value => value != null).isBoolean(),
     body('authId').isString().isIn([
       'local', 'ldap', 'saml', 'oidc', 'basic', 'google', 'github', 'twitter',
     ]),
@@ -31,65 +31,65 @@ const validator = {
     body('registrationMode').isString().isIn([
       'Open', 'Restricted', 'Closed',
     ]),
-    body('registrationWhiteList').if((value, { req }) => req.body.registrationWhiteList).isArray().customSanitizer((value, { req }) => {
+    body('registrationWhiteList').if(value => value != null).isArray().customSanitizer((value, { req }) => {
       return value.filter(email => email !== '');
     }),
   ],
   ldapAuth: [
-    body('serverUrl').if((value, { req }) => req.body.serverUrl).isString(),
-    body('isUserBind').if((value, { req }) => req.body.isUserBind).isBoolean(),
-    body('ldapBindDN').if((value, { req }) => req.body.ldapBindDN).isString(),
-    body('ldapBindDNPassword').if((value, { req }) => req.body.ldapBindDNPassword).isString(),
-    body('ldapSearchFilter').if((value, { req }) => req.body.ldapSearchFilter).isString(),
-    body('ldapAttrMapUsername').if((value, { req }) => req.body.ldapAttrMapUsername).isString(),
-    body('isSameUsernameTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameUsernameTreatedAsIdenticalUser).isBoolean(),
-    body('ldapAttrMapMail').if((value, { req }) => req.body.ldapAttrMapMail).isString(),
-    body('ldapAttrMapName').if((value, { req }) => req.body.ldapAttrMapName).isString(),
-    body('ldapGroupSearchBase').if((value, { req }) => req.body.ldapGroupSearchBase).isString(),
-    body('ldapGroupSearchFilter').if((value, { req }) => req.body.ldapGroupSearchFilter).isString(),
-    body('ldapGroupDnProperty').if((value, { req }) => req.body.ldapGroupDnProperty).isString(),
+    body('serverUrl').if(value => value != null).isString(),
+    body('isUserBind').if(value => value != null).isBoolean(),
+    body('ldapBindDN').if(value => value != null).isString(),
+    body('ldapBindDNPassword').if(value => value != null).isString(),
+    body('ldapSearchFilter').if(value => value != null).isString(),
+    body('ldapAttrMapUsername').if(value => value != null).isString(),
+    body('isSameUsernameTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
+    body('ldapAttrMapMail').if(value => value != null).isString(),
+    body('ldapAttrMapName').if(value => value != null).isString(),
+    body('ldapGroupSearchBase').if(value => value != null).isString(),
+    body('ldapGroupSearchFilter').if(value => value != null).isString(),
+    body('ldapGroupDnProperty').if(value => value != null).isString(),
   ],
   samlAuth: [
-    body('entryPoint').if((value, { req }) => req.body.samlEntryPoint).isString(),
-    body('issuer').if((value, { req }) => req.body.samlIssuer).isString(),
-    body('cert').if((value, { req }) => req.body.samlCert).isString(),
-    body('attrMapId').if((value, { req }) => req.body.samlAttrMapId).isString(),
-    body('attrMapUsername').if((value, { req }) => req.body.samlAttrMapUsername).isString(),
-    body('attrMapMail').if((value, { req }) => req.body.samlAttrMapMail).isString(),
-    body('attrMapFirstName').if((value, { req }) => req.body.samlAttrMapFirstName).isString(),
-    body('attrMapLastName').if((value, { req }) => req.body.samlAttrMapLastName).isString(),
-    body('isSameUsernameTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameUsernameTreatedAsIdenticalUser).isBoolean(),
-    body('isSameEmailTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameEmailTreatedAsIdenticalUser).isBoolean(),
-    body('ABLCRule').if((value, { req }) => req.body.samlABLCRule).isString(),
+    body('entryPoint').if(value => value != null).isString(),
+    body('issuer').if(value => value != null).isString(),
+    body('cert').if(value => value != null).isString(),
+    body('attrMapId').if(value => value != null).isString(),
+    body('attrMapUsername').if(value => value != null).isString(),
+    body('attrMapMail').if(value => value != null).isString(),
+    body('attrMapFirstName').if(value => value != null).isString(),
+    body('attrMapLastName').if(value => value != null).isString(),
+    body('isSameUsernameTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
+    body('isSameEmailTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
+    body('ABLCRule').if(value => value != null).isString(),
   ],
   oidcAuth: [
-    body('oidcProviderName').if((value, { req }) => req.body.oidcProviderName).isString(),
-    body('oidcIssuerHost').if((value, { req }) => req.body.oidcIssuerHost).isString(),
-    body('oidcClientId').if((value, { req }) => req.body.oidcClientId).isString(),
-    body('oidcClientSecret').if((value, { req }) => req.body.oidcClientSecret).isString(),
-    body('oidcAttrMapId').if((value, { req }) => req.body.oidcAttrMapId).isString(),
-    body('oidcAttrMapUserName').if((value, { req }) => req.body.oidcAttrMapUserName).isString(),
-    body('oidcAttrMapEmail').if((value, { req }) => req.body.oidcAttrMapEmail).isString(),
-    body('isSameUsernameTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameUsernameTreatedAsIdenticalUser).isBoolean(),
-    body('isSameEmailTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameEmailTreatedAsIdenticalUser).isBoolean(),
+    body('oidcProviderName').if(value => value != null).isString(),
+    body('oidcIssuerHost').if(value => value != null).isString(),
+    body('oidcClientId').if(value => value != null).isString(),
+    body('oidcClientSecret').if(value => value != null).isString(),
+    body('oidcAttrMapId').if(value => value != null).isString(),
+    body('oidcAttrMapUserName').if(value => value != null).isString(),
+    body('oidcAttrMapEmail').if(value => value != null).isString(),
+    body('isSameUsernameTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
+    body('isSameEmailTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
   ],
   basicAuth: [
-    body('isSameUsernameTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameUsernameTreatedAsIdenticalUser).isBoolean(),
+    body('isSameUsernameTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
   ],
   googleOAuth: [
-    body('googleClientId').if((value, { req }) => req.body.googleClientId).isString(),
-    body('googleClientSecret').if((value, { req }) => req.body.googleClientSecret).isString(),
-    body('isSameUsernameTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameUsernameTreatedAsIdenticalUser).isBoolean(),
+    body('googleClientId').if(value => value != null).isString(),
+    body('googleClientSecret').if(value => value != null).isString(),
+    body('isSameUsernameTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
   ],
   githubOAuth: [
-    body('githubClientId').if((value, { req }) => req.body.githubClientId).isString(),
-    body('githubClientSecret').if((value, { req }) => req.body.githubClientSecret).isString(),
-    body('isSameUsernameTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameUsernameTreatedAsIdenticalUser).isBoolean(),
+    body('githubClientId').if(value => value != null).isString(),
+    body('githubClientSecret').if(value => value != null).isString(),
+    body('isSameUsernameTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
   ],
   twitterOAuth: [
-    body('twitterConsumerKey').if((value, { req }) => req.body.twitterConsumerKey).isString(),
-    body('twitterConsumerSecret').if((value, { req }) => req.body.twitterConsumerSecret).isString(),
-    body('isSameUsernameTreatedAsIdenticalUser').if((value, { req }) => req.body.isSameUsernameTreatedAsIdenticalUser).isBoolean(),
+    body('twitterConsumerKey').if(value => value != null).isString(),
+    body('twitterConsumerSecret').if(value => value != null).isString(),
+    body('isSameUsernameTreatedAsIdenticalUser').if(value => value != null).isBoolean(),
   ],
 };