فهرست منبع

fix fb: reposition

zahmis 4 سال پیش
والد
کامیت
c5ad637e24
2فایلهای تغییر یافته به همراه10 افزوده شده و 6 حذف شده
  1. 7 5
      packages/slackbot-proxy/src/controllers/slack.ts
  2. 3 1
      packages/slackbot-proxy/src/services/RelationsService.ts

+ 7 - 5
packages/slackbot-proxy/src/controllers/slack.ts

@@ -38,11 +38,6 @@ const logger = loggerFactory('slackbot-proxy:controllers:slack');
 
 const postNotAllowedMessage = async(client:WebClient, body:any, disallowedGrowiUrls:Set<string>, commandName:string):Promise<void> => {
 
-  let payload:any;
-  if (body.payload != null) {
-    payload = JSON.parse(body.payload);
-  }
-
   const linkUrlList = Array.from(disallowedGrowiUrls).map((growiUrl) => {
     return '\n'
       + `• ${new URL('/admin/slack-integration', growiUrl).toString()}`;
@@ -50,6 +45,11 @@ const postNotAllowedMessage = async(client:WebClient, body:any, disallowedGrowiU
 
   const growiDocsLink = 'https://docs.growi.org/en/admin-guide/upgrading/43x.html';
 
+  let payload:any;
+  if (body.payload != null) {
+    payload = JSON.parse(body.payload);
+  }
+
   await client.chat.postEphemeral({
     text: 'Error occured.',
     channel: body.channel_id || payload.channel.id,
@@ -337,6 +337,8 @@ export class SlackCtrl {
 
     const actionId:string = payload?.actions?.[0].action_id;
     const permission = await this.relationsService.checkPermissionForInteractions(relations, actionId, callbackId, channelName);
+    console.log(permission);
+
     const { allowedRelations, disallowedGrowiUrls, commandName } = permission;
 
     if (relations.length === disallowedGrowiUrls.size) {

+ 3 - 1
packages/slackbot-proxy/src/services/RelationsService.ts

@@ -121,7 +121,7 @@ export class RelationsService {
     const disallowedGrowiUrls:Set<string> = new Set();
     let commandName = '';
 
-    await Promise.all(relations.map(async(relation) => {
+    const hoge = await Promise.allSettled(relations.map(async(relation) => {
       let permissionForInteractions:boolean|string[];
       const singleUse = Object.keys(relation.permissionsForSingleUseCommands);
       const broadCastUse = Object.keys(relation.permissionsForBroadcastUseCommands);
@@ -158,6 +158,8 @@ export class RelationsService {
 
     }));
 
+    console.log(hoge);
+
     return { allowedRelations, disallowedGrowiUrls, commandName };
 
   }