Explorar el Código

add proxy data to response

itizawa hace 4 años
padre
commit
5e0e564456
Se han modificado 1 ficheros con 4 adiciones y 6 borrados
  1. 4 6
      src/server/routes/apiv3/slack-integration-settings.js

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

@@ -122,14 +122,10 @@ module.exports = (crowi) => {
       settings.slackBotToken = configManager.getConfig('crowi', 'slackbot:token');
       settings.slackBotToken = configManager.getConfig('crowi', 'slackbot:token');
     }
     }
     else {
     else {
-      // settings.proxyUriEnvVars = ;
-      // settings.proxyUri = ;
-      // settings.tokenPtoG = ;
-      // settings.tokenGtoP = ;
+      settings.proxyUri = crowi.configManager.getConfig('crowi', 'slackbot:serverUri');
+      settings.proxyUriEnvVars = configManager.getConfigFromEnvVars('crowi', 'slackbot:serverUri');
     }
     }
 
 
-    // TODO: try-catch
-
     // retrieve connection statuses
     // retrieve connection statuses
     let connectionStatuses;
     let connectionStatuses;
     if (currentBotType == null) {
     if (currentBotType == null) {
@@ -144,6 +140,8 @@ module.exports = (crowi) => {
     }
     }
     else {
     else {
       const slackAppIntegrations = await SlackAppIntegration.find();
       const slackAppIntegrations = await SlackAppIntegration.find();
+      settings.slackAppIntegrations = slackAppIntegrations;
+
       const tokenGtoPs = slackAppIntegrations.map(slackAppIntegration => slackAppIntegration.tokenGtoP);
       const tokenGtoPs = slackAppIntegrations.map(slackAppIntegration => slackAppIntegration.tokenGtoP);
       connectionStatuses = (await getConnectionStatusesFromProxy(tokenGtoPs)).connectionStatuses;
       connectionStatuses = (await getConnectionStatusesFromProxy(tokenGtoPs)).connectionStatuses;
     }
     }