wip success search

packages/app/src/server/routes/apiv3/slack-integration.js

@@ -253,7 +253,6 @@ module.exports = (crowi) => {
   });
 
   router.post('/proxied/interactions', verifyAccessTokenFromProxy, /* checkCommandPermission, */ async(req, res) => {
-    console.log(256);
     return handleInteractions(req, res);
   });
 

packages/slackbot-proxy/src/controllers/slack.ts

@@ -171,11 +171,15 @@ export class SlackCtrl {
     const baseDate = new Date();
 
     const relationsForSingleUse:RelationMock[] = [];
-    // console.log(body);
 
     await Promise.all(relations.map(async(relation) => {
+      console.log(176);
+
       const isSupported = await this.relationsService.isSupportedGrowiCommandForSingleUse(relation, growiCommand.growiCommandType, body.channel_name, baseDate);
+
       if (isSupported) {
+        console.log(179);
+
         return relationsForSingleUse.push(relation);
       }
     }));
@@ -192,7 +196,9 @@ export class SlackCtrl {
       const isSupported = await this.relationsService.isSupportedGrowiCommandForBroadcastUse(
         relation, growiCommand.growiCommandType, body.channel_name, baseDate,
       );
+
       if (isSupported) {
+        console.log(196);
         relationsForBroadcastUse.push(relation);
       }
     }));
@@ -202,6 +208,8 @@ export class SlackCtrl {
      */
     if (relationsForBroadcastUse.length > 0) {
       body.growiUrisForBroadcastUse = relationsForBroadcastUse.map(v => v.growiUri);
+      console.log(body.growiUrisForBroadcastUse, 211);
+
       return this.sendCommand(growiCommand, relationsForBroadcastUse, body);
     }
 
@@ -242,8 +250,12 @@ export class SlackCtrl {
     const payload = JSON.parse(body.payload);
     const callbackId = payload?.view?.callback_id;
     const actionId = payload?.actions?.[0].action_id;
+    let privateMeta:any;
+
+    if (payload.view != null) {
+      privateMeta = JSON.parse(payload?.view?.private_metadata);
+    }
 
-    const privateMeta = JSON.parse(payload?.view?.private_metadata);
     const channelName = payload.channel?.name || privateMeta?.body?.channel_name || privateMeta?.channelName;
     const installationId = authorizeResult.enterpriseId || authorizeResult.teamId;
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
@@ -313,17 +325,12 @@ export class SlackCtrl {
 
         if (Array.isArray(permission)) {
           isPermitted = permission.includes(channelName);
-
         }
 
         // ex. search OR search:handlerName
         const commandRegExp = new RegExp(`(^${commandName}$)|(^${commandName}:\\w+)`);
-        console.log(commandRegExp);
-        console.log(actionId);
-        console.log(callbackId);
-
 
-        // skip this forEach loop if the requested command is not in permissionsForBroadcastUseCommands key
+        // skip this forEach loop if the requested command is not in permissionsForBroadcastUseCommands and permissionsForSingleUseCommandskey
         if (!commandRegExp.test(actionId) && !commandRegExp.test(callbackId)) {
           return;
         }
@@ -350,9 +357,6 @@ export class SlackCtrl {
         /*
          * forward to GROWI server
          */
-        console.log(payload);
-        console.log('--------');
-
 
         try {
         // generate API URL
@@ -370,8 +374,6 @@ export class SlackCtrl {
         }
 
       });
-
-
     }));
 
   }

packages/slackbot-proxy/src/services/RelationsService.ts

@@ -71,22 +71,35 @@ export class RelationsService {
     if (syncedRelation == null) {
       return false;
     }
+    console.log(growiCommandType, 74);
 
-    const boolOrArrayString = relation.supportedCommandsForSingleUse[growiCommandType];
-    console.log(boolOrArrayString);
+    const commandRegExp = new RegExp(`(^${growiCommandType}$)|(^${growiCommandType}:\\w+)`);
+
+    // skip this forEach loop if the requested command is not in permissionsForBroadcastUseCommands
+    if (!commandRegExp.test(growiCommandType)) {
+      console.log(209);
+      return false;
+    }
+    console.log(relation.supportedCommandsForSingleUse, 83);
+    console.log(relation.supportedCommandsForSingleUse[growiCommandType], 84);
+
+    const permission = relation.supportedCommandsForSingleUse[growiCommandType];
+    console.log(permission, 76);
+
+    if (permission == null) {
+      console.log(88);
 
-    if (boolOrArrayString == null) {
       return false;
     }
     console.log(81, channelName);
 
-    if (Array.isArray(boolOrArrayString)) {
+    if (Array.isArray(permission)) {
 
-      return boolOrArrayString.includes(channelName);
+      return permission.includes(channelName);
     }
     console.log(84);
 
-    return boolOrArrayString;
+    return permission;
   }
 
   async isSupportedGrowiCommandForBroadcastUse(relation:RelationMock, growiCommandType:string, channelName:string, baseDate:Date):Promise<boolean> {
@@ -94,17 +107,30 @@ export class RelationsService {
     if (syncedRelation == null) {
       return false;
     }
-    const boolOrArrayString = relation.supportedCommandsForBroadcastUse[growiCommandType];
 
-    if (boolOrArrayString == null) {
+    const commandRegExp = new RegExp(`(^${growiCommandType}$)|(^${growiCommandType}:\\w+)`);
+
+    // skip this forEach loop if the requested command is not in permissionsForSingleUseCommandskey
+    if (!commandRegExp.test(growiCommandType)) {
+      console.log(183);
+
+      return false;
+    }
+    console.log(119);
+
+    const permission = relation.supportedCommandsForBroadcastUse[growiCommandType];
+    console.log(permission);
+
+
+    if (permission == null) {
       return false;
     }
 
-    if (Array.isArray(boolOrArrayString)) {
-      return boolOrArrayString.includes(channelName);
+    if (Array.isArray(permission)) {
+      return permission.includes(channelName);
     }
 
-    return boolOrArrayString;
+    return permission;
   }
 
 }