clean and fix name

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

@@ -101,14 +101,14 @@ export class GrowiToSlackCtrl {
   async putSupportedCommands(@Req() req: GrowiReq, @Res() res: Res): Promise<void|string|Res|WebAPICallResult> {
     // asserted (tokenGtoPs.length > 0) by verifyGrowiToSlackRequest
     const { tokenGtoPs } = req;
-    const { supportedCommandsForBroadcastUse, supportedCommandsForSingleUse } = req.body;
+    const { permissionsForBroadcastUseCommands, permissionsForSingleUseCommands } = req.body;
 
     if (tokenGtoPs.length !== 1) {
       throw createError(400, 'installation is invalid');
     }
 
     const tokenGtoP = tokenGtoPs[0];
-    const relation = await this.relationMockRepository.update({ tokenGtoP }, { supportedCommandsForBroadcastUse, supportedCommandsForSingleUse });
+    const relation = await this.relationMockRepository.update({ tokenGtoP }, { permissionsForBroadcastUseCommands, permissionsForSingleUseCommands });
 
     return res.send({ relation });
   }
@@ -200,8 +200,8 @@ export class GrowiToSlackCtrl {
         tokenGtoP: order.tokenGtoP,
         tokenPtoG: order.tokenPtoG,
         growiUri: order.growiUrl,
-        supportedCommandsForBroadcastUse: req.body.supportedCommandsForBroadcastUse,
-        supportedCommandsForSingleUse: req.body.supportedCommandsForSingleUse,
+        permissionsForBroadcastUseCommands: req.body.permissionsForBroadcastUseCommands,
+        permissionsForSingleUseCommands: req.body.permissionsForSingleUseCommands,
         expiredAtCommands,
       })
       // https://github.com/typeorm/typeorm/issues/1090#issuecomment-634391487

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

@@ -67,60 +67,6 @@ export class RelationsService {
     return relation;
   }
 
-  // async isSupportedGrowiCommandForSingleUse(relation:RelationMock, growiCommandType:string, channelName:string, baseDate:Date):Promise<boolean> {
-  //   const syncedRelation = await this.syncRelation(relation, baseDate);
-
-  //   if (syncedRelation == null) {
-  //     return false;
-  //   }
-
-  //   const commandRegExp = new RegExp(`(^${growiCommandType}$)|(^${growiCommandType}:\\w+)`);
-
-  //   // skip this forEach loop if the requested command is not in permissionsForBroadcastUseCommands
-  //   if (!commandRegExp.test(growiCommandType)) {
-  //     return false;
-  //   }
-
-  //   const permission = relation.supportedCommandsForSingleUse[growiCommandType];
-
-  //   if (permission == null) {
-  //     return false;
-  //   }
-
-  //   if (Array.isArray(permission)) {
-  //     return permission.includes(channelName);
-  //   }
-
-  //   return permission;
-  // }
-
-  // async isSupportedGrowiCommandForBroadcastUse(relation:RelationMock, growiCommandType:string, channelName:string, baseDate:Date):Promise<boolean> {
-  //   const syncedRelation = await this.syncRelation(relation, baseDate);
-  //   if (syncedRelation == null) {
-  //     return false;
-  //   }
-
-  //   const commandRegExp = new RegExp(`(^${growiCommandType}$)|(^${growiCommandType}:\\w+)`);
-
-  //   // skip this forEach loop if the requested command is not in permissionsForSingleUseCommandskey
-  //   if (!commandRegExp.test(growiCommandType)) {
-  //     return false;
-  //   }
-
-  //   const permission = relation.supportedCommandsForBroadcastUse[growiCommandType];
-
-  //   if (permission == null) {
-  //     return false;
-  //   }
-
-  //   if (Array.isArray(permission)) {
-  //     return permission.includes(channelName);
-  //   }
-
-  //   return permission;
-  // }
-
-
   async checkPermissionForCommands(relation:RelationMock, growiCommandType:string, channelName:string, baseDate:Date):Promise<boolean> {
     const syncedRelation = await this.syncRelation(relation, baseDate);
     if (syncedRelation == null) {