Browse Source

validator

itizawa 6 years ago
parent
commit
8d8a849386
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/server/routes/apiv3/security-setting.js

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

@@ -86,9 +86,9 @@ const validator = {
     body('isSameUsernameTreatedAsIdenticalUser').isBoolean(),
   ],
   twitterOAuth: [
-    body('twitterConsumerKey').isString(),
-    body('twitterConsumerSecret').isString(),
-    body('isSameUsernameTreatedAsIdenticalUser').isBoolean(),
+    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(),
   ],
 };
 
@@ -897,7 +897,7 @@ module.exports = (crowi) => {
     if (isSameUsernameTreatedAsIdenticalUser != null) { requestParams.push({ 'security:passport-twitter:isSameUsernameTreatedAsIdenticalUser': isSameUsernameTreatedAsIdenticalUser }) }
 
     try {
-      await crowi.configManager.updateConfigsInTheSameNamespace('crowi', requestParams);
+      await crowi.configManager.updateConfigsInTheSameNamespace('crowi', ...requestParams);
       await crowi.passportService.setupStrategyById('twitter');
       const securitySettingParams = {
         twitterConsumerId: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:consumerKey'),