zahmis 5 лет назад
Родитель
Сommit
6a80232509
1 измененных файлов с 8 добавлено и 6 удалено
  1. 8 6
      src/server/routes/apiv3/slack-integration.js

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

@@ -273,11 +273,14 @@ module.exports = (crowi) => {
   router.post('/test-notification-to-slack-work-space', async(req, res) => {
   router.post('/test-notification-to-slack-work-space', async(req, res) => {
     const slackBotToken = crowi.configManager.getConfig('crowi', 'slackbot:token');
     const slackBotToken = crowi.configManager.getConfig('crowi', 'slackbot:token');
 
 
-    if (slackBotToken != null) {
-      this.client = new WebClient(slackBotToken, { logLevel: LogLevel.DEBUG });
-      logger.debug('SlackBot: setup is done');
+    if (slackBotToken == null) {
+      const msg = 'Bot User OAuth Token is not setup.';
+      return res.apiv3Err(new ErrorV3(msg, 'not-setup-slack-bot-token', 400));
     }
     }
 
 
+    this.client = new WebClient(slackBotToken, { logLevel: LogLevel.DEBUG });
+    logger.debug('SlackBot: setup is done');
+
     try {
     try {
       this.client.chat.postMessage({
       this.client.chat.postMessage({
         channel: '#general',
         channel: '#general',
@@ -290,10 +293,9 @@ module.exports = (crowi) => {
       return res.apiv3({ message });
       return res.apiv3({ message });
     }
     }
     catch (error) {
     catch (error) {
-      console.log(error);
-      // const msg = 'Error occured in testing to notify slack work space';
+      const msg = 'Error occured in testing to notify slack work space';
       logger.error('Error', error);
       logger.error('Error', error);
-      return res.apiv3Err(new ErrorV3(error, 'test-notify-slack-work-space-failed'), 500);
+      return res.apiv3Err(new ErrorV3(msg, 'test-notify-slack-work-space-failed'), 500);
     }
     }
   });
   });