Taichi Masuyama 4 lat temu
rodzic
commit
b549778dfc

+ 2 - 3
packages/app/src/server/models/slack-app-integration-mock.js

@@ -9,9 +9,8 @@ const permittedChannelsForEachCommandSchema = new mongoose.Schema({
 const schema = new mongoose.Schema({
 const schema = new mongoose.Schema({
   tokenGtoP: { type: String, required: true, unique: true },
   tokenGtoP: { type: String, required: true, unique: true },
   tokenPtoG: { type: String, required: true, unique: true },
   tokenPtoG: { type: String, required: true, unique: true },
-  supportedCommandsForBroadcastUse: { type: [String], default: [] },
-  supportedCommandsForSingleUse: { type: [String], default: [] },
-  permittedChannelsForEachCommand: permittedChannelsForEachCommandSchema,
+  supportedCommandsForBroadcastUse: Map,
+  supportedCommandsForSingleUse: Map,
 });
 });
 
 
 class SlackAppIntegrationMock {
 class SlackAppIntegrationMock {

+ 5 - 14
packages/slackbot-proxy/src/entities/relation-mock.ts

@@ -4,14 +4,8 @@ import {
 import { differenceInMilliseconds } from 'date-fns';
 import { differenceInMilliseconds } from 'date-fns';
 import { Installation } from './installation';
 import { Installation } from './installation';
 
 
-
-// expected data see below
-//   commandToChannelMap: {
-//     create: ['srv', 'admin'],
-//     search: ['admin'],
-//   }
-interface PermittedChannelsForEachCommand {
-  commandToChannelMap: { [command: string]: string[] };
+interface PermissionSettingsInterface {
+  [commandName: string]: boolean | string[],
 }
 }
 
 
 @Entity()
 @Entity()
@@ -41,14 +35,11 @@ export class RelationMock {
   @Column()
   @Column()
   growiUri: string;
   growiUri: string;
 
 
-  @Column('simple-array')
-  supportedCommandsForBroadcastUse: string[];
-
-  @Column('simple-array')
-  supportedCommandsForSingleUse: string[];
+  @Column({ type: 'json' })
+  permissionSettingsForBroadcastUseCommands: PermissionSettingsInterface;
 
 
   @Column({ type: 'json' })
   @Column({ type: 'json' })
-  permittedChannelsForEachCommand : PermittedChannelsForEachCommand
+  permissionSettingsForSingleUseCommands: PermissionSettingsInterface;
 
 
   @CreateDateColumn()
   @CreateDateColumn()
   expiredAtCommands: Date;
   expiredAtCommands: Date;