itizawa 4 лет назад
Родитель
Сommit
8b30b575a5

+ 2 - 2
packages/slackbot-proxy/src/middlewares/slack-to-growi/extract-growi-uri-from-req.ts

@@ -2,7 +2,7 @@ import {
   IMiddleware, Middleware, Next, Req, Res,
   IMiddleware, Middleware, Next, Req, Res,
 } from '@tsed/common';
 } from '@tsed/common';
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
 import { SlackOauthReq } from '~/interfaces/slack-to-growi/slack-oauth-req';
-import { DelegatorTypes, growiUriInjectorFactory } from '~/services/growi-uri-injector/GrowiUriInjectorFactory';
+import { growiUriInjectorFactory } from '~/services/growi-uri-injector/GrowiUriInjectorFactory';
 import { extractGrowiUriFromView } from '~/utils/extractGrowiUriFromView';
 import { extractGrowiUriFromView } from '~/utils/extractGrowiUriFromView';
 
 
 @Middleware()
 @Middleware()
@@ -20,7 +20,7 @@ export class ExtractGrowiUriFromReq implements IMiddleware {
     }
     }
     else {
     else {
       // break when uri is found
       // break when uri is found
-      for (const type of Object.values(DelegatorTypes)) {
+      for (const type of Object.keys(growiUriInjectorFactory)) {
         const growiUriInjector = growiUriInjectorFactory[type]();
         const growiUriInjector = growiUriInjectorFactory[type]();
         const extractedValues = growiUriInjector.extract(payload.actions[0]);
         const extractedValues = growiUriInjector.extract(payload.actions[0]);
 
 

+ 3 - 8
packages/slackbot-proxy/src/services/growi-uri-injector/GrowiUriInjectorFactory.ts

@@ -1,22 +1,17 @@
 import { GrowiUriInjector } from './GrowiUriInjector';
 import { GrowiUriInjector } from './GrowiUriInjector';
 import { GrowiUriInjectionButtonDelegator } from './GrowiUriInjectionButtonDelegator';
 import { GrowiUriInjectionButtonDelegator } from './GrowiUriInjectionButtonDelegator';
 
 
-export const DelegatorTypes = {
-  BUTTON: 'button',
-} as const;
-export type DelegatorTypes = typeof DelegatorTypes[keyof typeof DelegatorTypes];
-
 /**
 /**
  * Instanciate GrowiUriInjector
  * Instanciate GrowiUriInjector
  */
  */
 export const growiUriInjectorFactory = {
 export const growiUriInjectorFactory = {
-  [DelegatorTypes.BUTTON]: (): GrowiUriInjector => {
+  button: (): GrowiUriInjector => {
     return new GrowiUriInjectionButtonDelegator();
     return new GrowiUriInjectionButtonDelegator();
   },
   },
 };
 };
 
 
-export const findInjectorByType = (type :DelegatorTypes): null|GrowiUriInjector => {
-  if (!Object.values(DelegatorTypes).includes(type)) {
+export const findInjectorByType = (type:string): null|GrowiUriInjector => {
+  if (!Object.keys(growiUriInjectorFactory).includes(type)) {
     return null;
     return null;
   }
   }
   return growiUriInjectorFactory[type]();
   return growiUriInjectorFactory[type]();