Просмотр исходного кода

Merge pull request #3824 from weseek/fix/5782-6197-fix-create-command

Fix/5782 6197 fix create command
Yuki Takei 4 лет назад
Родитель
Сommit
2e06614d7d

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

@@ -153,11 +153,11 @@ export class SlackCtrl {
     const installation = await this.installationRepository.findByTeamIdOrEnterpriseId(installationId!);
     const installation = await this.installationRepository.findByTeamIdOrEnterpriseId(installationId!);
 
 
     const payload = JSON.parse(body.payload);
     const payload = JSON.parse(body.payload);
-    const { type } = payload;
+    const callBackId = payload?.view?.callback_id;
 
 
     // register
     // register
     // response_urls is an array but the element included is only one.
     // response_urls is an array but the element included is only one.
-    if (type === 'view_submission') {
+    if (callBackId === 'register') {
       await this.registerService.upsertOrderRecord(this.orderRepository, installation, payload);
       await this.registerService.upsertOrderRecord(this.orderRepository, installation, payload);
       await this.registerService.notifyServerUriToSlack(authorizeResult, payload);
       await this.registerService.notifyServerUriToSlack(authorizeResult, payload);
       return;
       return;

+ 1 - 0
packages/slackbot-proxy/src/services/RegisterService.ts

@@ -19,6 +19,7 @@ export class RegisterService implements GrowiCommandProcessor {
       trigger_id: body.trigger_id,
       trigger_id: body.trigger_id,
       view: {
       view: {
         type: 'modal',
         type: 'modal',
+        callback_id: 'register',
         title: {
         title: {
           type: 'plain_text',
           type: 'plain_text',
           text: 'Register Credentials',
           text: 'Register Credentials',

+ 2 - 2
src/server/routes/apiv3/slack-integration.js

@@ -157,12 +157,12 @@ module.exports = (crowi) => {
     }
     }
   };
   };
 
 
-  const handleViewSubmission = async(payload) => {
+  const handleViewSubmission = async(client, payload) => {
     const { callback_id: callbackId } = payload.view;
     const { callback_id: callbackId } = payload.view;
 
 
     switch (callbackId) {
     switch (callbackId) {
       case 'createPage':
       case 'createPage':
-        await crowi.slackBotService.createPageInGrowi(payload);
+        await crowi.slackBotService.createPageInGrowi(client, payload);
         break;
         break;
       default:
       default:
         break;
         break;