itizawa %!s(int64=4) %!d(string=hai) anos
pai
achega
14f54de821

+ 3 - 3
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 { DelegatorType, factory as GrowiUriInjectorFactory } from '~/services/growi-uri-injector';
+import { DelegatorTypes, factory as GrowiUriInjectorFactory } from '~/services/growi-uri-injector';
 import { growiUriInjectionModalDelegator } from '~/services/growi-uri-injector/GrowiUriInjectionModalDelegator';
 import { growiUriInjectionModalDelegator } from '~/services/growi-uri-injector/GrowiUriInjectionModalDelegator';
 
 
 @Middleware()
 @Middleware()
@@ -12,6 +12,7 @@ export class ExtractGrowiUriFromReq implements IMiddleware {
 
 
     const payload = JSON.parse(req.body.payload);
     const payload = JSON.parse(req.body.payload);
 
 
+    // extract for modal
     if (payload.view != null) {
     if (payload.view != null) {
       const parsedValues = growiUriInjectionModalDelegator.extract(payload);
       const parsedValues = growiUriInjectionModalDelegator.extract(payload);
       req.growiUri = parsedValues.growiUri;
       req.growiUri = parsedValues.growiUri;
@@ -19,10 +20,9 @@ export class ExtractGrowiUriFromReq implements IMiddleware {
     }
     }
     else {
     else {
       // break when uri is found
       // break when uri is found
-      for (const type of Object.values(DelegatorType)) {
+      for (const type of Object.values(DelegatorTypes)) {
         const growiUriInjector = GrowiUriInjectorFactory.getDelegator(type);
         const growiUriInjector = GrowiUriInjectorFactory.getDelegator(type);
         const parsedValues = growiUriInjector.extract(payload.actions[0]);
         const parsedValues = growiUriInjector.extract(payload.actions[0]);
-        console.log(25, payload.actions[0], parsedValues);
 
 
         if (parsedValues.growiUri != null) {
         if (parsedValues.growiUri != null) {
           req.growiUri = parsedValues.growiUri;
           req.growiUri = parsedValues.growiUri;

+ 5 - 5
packages/slackbot-proxy/src/services/growi-uri-injector/index.ts

@@ -1,13 +1,13 @@
 import { GrowiUriInjector } from './GrowiUriInjector';
 import { GrowiUriInjector } from './GrowiUriInjector';
 import { GrowiUriInjectionButtonDelegator } from './GrowiUriInjectionButtonDelegator';
 import { GrowiUriInjectionButtonDelegator } from './GrowiUriInjectionButtonDelegator';
 
 
-export const DelegatorType = {
+export const DelegatorTypes = {
   BUTTON: 'button',
   BUTTON: 'button',
 } as const;
 } as const;
-export type DelegatorType = typeof DelegatorType[keyof typeof DelegatorType];
+export type DelegatorTypes = typeof DelegatorTypes[keyof typeof DelegatorTypes];
 
 
-const TypeToDelegatorMappings:{[key in DelegatorType]:GrowiUriInjector} = {
-  [DelegatorType.BUTTON]: new GrowiUriInjectionButtonDelegator(),
+const TypeToDelegatorMappings:{[key in DelegatorTypes]:GrowiUriInjector} = {
+  [DelegatorTypes.BUTTON]: new GrowiUriInjectionButtonDelegator(),
 };
 };
 
 
 
 
@@ -16,7 +16,7 @@ const TypeToDelegatorMappings:{[key in DelegatorType]:GrowiUriInjector} = {
  */
  */
 class GrowiUriInjectorFactory {
 class GrowiUriInjectorFactory {
 
 
-  getDelegator(type:DelegatorType) {
+  getDelegator(type:DelegatorTypes) {
     return TypeToDelegatorMappings[type];
     return TypeToDelegatorMappings[type];
   }
   }