itizawa 5 лет назад
Родитель
Сommit
f124eedb9b
2 измененных файлов с 8 добавлено и 16 удалено
  1. 8 15
      src/server/routes/apiv3/slack-integration.js
  2. 0 1
      src/server/service/slackbot.js

+ 8 - 15
src/server/routes/apiv3/slack-integration.js

@@ -223,24 +223,17 @@ module.exports = (crowi) => {
    *            description: Succeeded to get slack ws name for custom bot without proxy
    */
   router.get('/custom-bot-without-proxy/slack-workspace-name', async(req, res) => {
-    // get ws name in custom bot from slackbot token
-    const slackBotToken = crowi.configManager.getConfig('crowi', 'slackbot:token');
 
-    let slackWorkSpaceName = null;
-    if (slackBotToken != null) {
-      const web = new WebClient(slackBotToken);
-      try {
-        const slackTeamInfo = await web.team.info();
-        slackWorkSpaceName = slackTeamInfo.team.name;
-      }
-      catch (error) {
-        const msg = 'Error occured in slack_bot_token';
-        logger.error('Error', error);
-        return res.apiv3Err(new ErrorV3(msg, 'get-SlackWorkSpaceName-failed'), 500);
-      }
+    try {
+      const slackWorkSpaceName = await crowi.slackBotService.getSlackChannelName();
+      return res.apiv3({ slackWorkSpaceName });
+    }
+    catch (error) {
+      const msg = 'Error occured in slack_bot_token';
+      logger.error('Error', error);
+      return res.apiv3Err(new ErrorV3(msg, 'get-SlackWorkSpaceName-failed'), 500);
     }
 
-    return res.apiv3({ slackWorkSpaceName });
   });
 
   /**

+ 0 - 1
src/server/service/slackbot.js

@@ -155,7 +155,6 @@ class SlackBotService extends S2sMessageHandlable {
 
   async getSlackChannelName() {
     const slackTeamInfo = await this.client.team.info();
-    console.log(slackTeamInfo);
     return slackTeamInfo.team.name;
   }