Просмотр исходного кода

modify return type of getConnectionStatuses

Yuki Takei 4 лет назад
Родитель
Сommit
5f77c8f8be

+ 5 - 2
packages/slack/src/utils/check-communicable.ts

@@ -60,8 +60,8 @@ const retrieveWorkspaceName = async(client: WebClient): Promise<string> => {
  * @param tokens Array of bot OAuth token
  * @returns
  */
-export const getConnectionStatuses = async(tokens: string[]): Promise<Map<string, ConnectionStatus>> => {
-  return tokens
+export const getConnectionStatuses = async(tokens: string[]): Promise<{[key: string]: ConnectionStatus}> => {
+  const map = tokens
     .reduce<Promise<Map<string, ConnectionStatus>>>(
       async(acc, token) => {
         const client = generateWebClient(token);
@@ -85,4 +85,7 @@ export const getConnectionStatuses = async(tokens: string[]): Promise<Map<string
       // define initial accumulator
       Promise.resolve(new Map<string, ConnectionStatus>()),
     );
+
+  // convert to object
+  return Object.fromEntries(await map);
 };

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

@@ -115,7 +115,7 @@ module.exports = (crowi) => {
       const token = settings.slackBotToken;
       // check the token is not null
       if (token != null) {
-        connectionStatuses = Object.fromEntries(await getConnectionStatuses([token]));
+        connectionStatuses = await getConnectionStatuses([token]);
       }
     }
     else {