zahmis 5 лет назад
Родитель
Сommit
df1dff1579
2 измененных файлов с 7 добавлено и 22 удалено
  1. 6 21
      src/server/routes/apiv3/slack-bot-setting.js
  2. 1 1
      src/server/service/config-loader.js

+ 6 - 21
src/server/routes/apiv3/slack-bot-setting.js

@@ -26,6 +26,8 @@ const router = express.Router();
  *            type: string
  *          slackBotToken:
  *            type: string
+ *          botType:
+ *            type: string
  */
 
 
@@ -105,10 +107,12 @@ module.exports = (crowi) => {
    */
   router.put('/custom-bot-setting',
     accessTokenParser, loginRequiredStrictly, adminRequired, csrf, validator.CusotmBotSettings, apiV3FormValidator, async(req, res) => {
-      const { slackSigningSecret, slackBotToken } = req.body;
+      const { slackSigningSecret, slackBotToken, botType } = req.body;
+
       const requestParams = {
         'slackbot:signingSecret': slackSigningSecret,
         'slackbot:token': slackBotToken,
+        'slackbot:type': botType,
       };
 
       try {
@@ -116,6 +120,7 @@ module.exports = (crowi) => {
         const slackBotSettingParams = {
           slackSigningSecret: await crowi.configManager.getConfig('crowi', 'slackbot:signingSecret'),
           slackBotToken: await crowi.configManager.getConfig('crowi', 'slackbot:token'),
+          slackBotType: await crowi.configManager.getConfig('crowi', 'slackbot:type'),
         };
         return res.apiv3({ slackBotSettingParams });
       }
@@ -126,25 +131,5 @@ module.exports = (crowi) => {
       }
     });
 
-  router.put('/enabled', async(req, res) => {
-    const { botType } = req.body;
-    console.log(botType);
-    const requestParams = { 'slackbot:type': botType };
-
-    try {
-      await updateBotSettings(requestParams);
-      const responseParams = {
-        'slackbot:type': await crowi.configManager.getConfig('crowi', 'slackbot:type'),
-      };
-      return res.apiv3({ responseParams });
-    }
-    catch (error) {
-      console.log('errormatu');
-    }
-
-
-  });
-
-
   return router;
 };

+ 1 - 1
src/server/service/config-loader.js

@@ -412,7 +412,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
   },
   SLACK_BOT_TYPE: {
     ns:      'crowi',
-    key:     'slackbot:type', // official || nonProxy || withProxy
+    key:     'slackbot:type', // eg. official || nonProxy || withProxy
     type:    TYPES.STRING,
     default: 'custom',
   },