Quellcode durchsuchen

wip return statuses even when proxy url is not defined

Steven Fukase vor 4 Jahren
Ursprung
Commit
c196da5bb3
1 geänderte Dateien mit 14 neuen und 14 gelöschten Zeilen
  1. 14 14
      src/server/routes/apiv3/slack-integration-settings.js

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

@@ -170,24 +170,24 @@ module.exports = (crowi) => {
       }
     }
     else {
-      const proxyServerUri = settings.proxyServerUri;
+      // const proxyServerUri = settings.proxyServerUri;
 
-      if (proxyServerUri != null) {
-        try {
-          const slackAppIntegrations = await SlackAppIntegration.find();
-          settings.slackAppIntegrations = slackAppIntegrations;
+      // if (proxyServerUri != null) {
+      try {
+        const slackAppIntegrations = await SlackAppIntegration.find();
+        settings.slackAppIntegrations = slackAppIntegrations;
 
-          if (slackAppIntegrations.length > 0) {
-            const tokenGtoPs = slackAppIntegrations.map(slackAppIntegration => slackAppIntegration.tokenGtoP);
-            connectionStatuses = (await getConnectionStatusesFromProxy(tokenGtoPs)).connectionStatuses;
-          }
-        }
-        catch (error) {
-          const msg = 'Error occured in getting connection statuses';
-          logger.error('Error', error);
-          return res.apiv3Err(new ErrorV3(msg, 'get-connection-failed'), 500);
+        if (slackAppIntegrations.length > 0) {
+          const tokenGtoPs = slackAppIntegrations.map(slackAppIntegration => slackAppIntegration.tokenGtoP);
+          connectionStatuses = (await getConnectionStatusesFromProxy(tokenGtoPs)).connectionStatuses;
         }
       }
+      catch (error) {
+        const msg = 'Error occured in getting connection statuses';
+        logger.error('Error', error);
+        return res.apiv3Err(new ErrorV3(msg, 'get-connection-failed'), 500);
+      }
+      // }
     }
 
     return res.apiv3({ currentBotType, settings, connectionStatuses });