2
0
itizawa 5 жил өмнө
parent
commit
12a433b674

+ 5 - 4
src/server/routes/apiv3/slack-integration.js

@@ -101,6 +101,7 @@ module.exports = (crowi) => {
         slackSigningSecret: crowi.configManager.getConfig('crowi', 'slackbot:signingSecret'),
         slackBotToken: crowi.configManager.getConfig('crowi', 'slackbot:token'),
         isSetupSlackBot: crowi.slackBotService.isSetupSlackBot,
+        isConnectedToSlack: crowi.slackBotService.isConnectedToSlack,
       },
       // TODO imple when creating with proxy
       customBotWithProxySettings: {
@@ -142,7 +143,7 @@ module.exports = (crowi) => {
         await updateSlackBotSettings(requestParams);
 
         // initialize slack service
-        crowi.slackBotService.initialize();
+        await crowi.slackBotService.initialize();
         crowi.slackBotService.publishUpdatedMessage();
 
         const slackIntegrationSettingsParams = {
@@ -190,7 +191,7 @@ module.exports = (crowi) => {
         await updateSlackBotSettings(requestParams);
 
         // initialize slack service
-        crowi.slackBotService.initialize();
+        await crowi.slackBotService.initialize();
         crowi.slackBotService.publishUpdatedMessage();
 
         // TODO Impl to delete AccessToken both of Proxy and GROWI when botType changes.
@@ -255,7 +256,7 @@ module.exports = (crowi) => {
       await updateSlackBotSettings({ 'slackbot:access-token': accessToken });
 
       // initialize slack service
-      crowi.slackBotService.initialize();
+      await crowi.slackBotService.initialize();
       crowi.slackBotService.publishUpdatedMessage();
 
       return res.apiv3({ accessToken });
@@ -286,7 +287,7 @@ module.exports = (crowi) => {
       await updateSlackBotSettings({ 'slackbot:access-token': null });
 
       // initialize slack service
-      crowi.slackBotService.initialize();
+      await crowi.slackBotService.initialize();
       crowi.slackBotService.publishUpdatedMessage();
 
       return res.apiv3({});

+ 2 - 2
src/server/service/slackbot.js

@@ -27,7 +27,7 @@ class SlackBotService extends S2sMessageHandlable {
     this.initialize();
   }
 
-  initialize() {
+  async initialize() {
     this.isSetupSlackBot = false;
 
     const token = this.crowi.configManager.getConfig('crowi', 'slackbot:token');
@@ -36,7 +36,7 @@ class SlackBotService extends S2sMessageHandlable {
       this.client = new WebClient(token, { logLevel: LogLevel.DEBUG });
       logger.debug('SlackBot: setup is done');
       this.isSetupSlackBot = true;
-      this.sendAuthTest();
+      await this.sendAuthTest();
     }
 
     this.lastLoadedAt = new Date();