zahmis 4 лет назад
Родитель
Сommit
395683a6ff
1 измененных файлов с 13 добавлено и 0 удалено
  1. 13 0
      src/server/routes/apiv3/slack-integration-settings.js

+ 13 - 0
src/server/routes/apiv3/slack-integration-settings.js

@@ -112,12 +112,21 @@ module.exports = (crowi) => {
 
     // retrieve settings
     const settings = {};
+    console.log('express');
     if (currentBotType === 'customBotWithoutProxy') {
+      console.log('without');
+
       settings.slackSigningSecretEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:signingSecret');
       settings.slackBotTokenEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:token');
       settings.slackSigningSecret = configManager.getConfig('crowi', 'slackbot:signingSecret');
       settings.slackBotToken = configManager.getConfig('crowi', 'slackbot:token');
     }
+    else if (currentBotType === null) {
+      settings.slackSigningSecretEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:signingSecret');
+      settings.slackBotTokenEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:token');
+      settings.slackSigningSecret = null;
+      settings.slackBotToken = null;
+    }
     else {
       // settings.proxyUriEnvVars = ;
       // settings.proxyUri = ;
@@ -130,12 +139,16 @@ module.exports = (crowi) => {
     // retrieve connection statuses
     let connectionStatuses;
     if (currentBotType === 'customBotWithoutProxy') {
+
       const token = settings.slackBotToken;
       // check the token is not null
       if (token != null) {
         connectionStatuses = await getConnectionStatuses([token]);
       }
     }
+    else if (currentBotType === null) {
+      console.log('currentBotType === null');
+    }
     else {
       // TODO: retrieve tokenGtoPs from DB
       const tokenGtoPs = ['gtop1'];