Merge branch 'develop' into main

Author: ccmoralesj

src/api-utils/midddleware/index.ts

@@ -48,7 +48,7 @@ export const parseSlackActionPayloadMiddleware = {
 };
 export const parseSlackEventPayloadMiddleware = {
   method: parseSlackEventPayload,
-  assign: 'slackActionPayload',
+  assign: 'slackEventsPayload',
 };
 
 export const parseSlackSlashCommandPayloadMiddleware = {

src/api-utils/midddleware/parseSlackActionPayload.ts

@@ -1,4 +1,4 @@
-import Querystring from 'querystring';
+// import Querystring from 'querystring';
 
 import Boom from '@hapi/boom';
 import type { Lifecycle, Request } from '@hapi/hapi';
@@ -20,16 +20,15 @@ export function parseSlackActionPayload(request: Request): Lifecycle.Method {
     throw Boom.internal('Payload is not a Buffer');
   }
 
-  const body = request.payload.toString('utf-8');
-  const { payload } = Querystring.parse(body);
+  const body = new URLSearchParams(request.payload.toString('utf-8'));
+  const payload = body.get('payload');
 
   const parsed:
     | SlackActionsPayload
     | SlackDialogsPayload
     | SlackBlockKitPayload
     | SlackShortcutPayload
-    | SlackDialogSubmissionPayload = JSON.parse(payload as string);
-
+    | SlackDialogSubmissionPayload = JSON.parse(payload || '');
   let mutableSlackPayload;
   switch (parsed.type) {
     case 'message_action':

src/api-utils/midddleware/parseSlackEventPayload.ts

@@ -1,5 +1,3 @@
-import Querystring from 'querystring';
-
 import Boom from '@hapi/boom';
 import type { Lifecycle } from '@hapi/hapi';
 
@@ -14,10 +12,10 @@ export const parseSlackEventPayload: Lifecycle.Method = (request) => {
     throw Boom.internal('Payload is not a Buffer');
   }
 
-  const body = request.payload.toString('utf-8');
-  const { payload } = Querystring.parse(body);
+  const body = new URLSearchParams(request.payload.toString('utf-8'));
+  const payload = body.get('payload');
 
-  const parsed: SlackChallengesPayload | SlackEventsPayload = JSON.parse(payload as string);
+  const parsed: SlackChallengesPayload | SlackEventsPayload = JSON.parse(payload || '');
 
   const slackEventPayload = parsed.challenge
     ? slackChallengesPayloadSchema.validate(parsed, { stripUnknown: true })

src/api-utils/midddleware/parseSlackSlashCommandPayload.ts

@@ -1,5 +1,3 @@
-import Querystring from 'querystring';
-
 import Boom from '@hapi/boom';
 import type { Lifecycle, Request } from '@hapi/hapi';
 
@@ -12,8 +10,10 @@ export function parseSlackSlashCommandPayload(request: Request): Lifecycle.Metho
     throw Boom.internal('Payload is not a Buffer');
   }
 
-  const body = request.payload.toString('utf-8');
-  const parsed = Querystring.parse(body) as unknown as SlackSlashCommandPayload;
+  const body = new URLSearchParams(request.payload.toString('utf-8'));
+  const payload = {} as any;
+  body.forEach((value, name) => (payload[name] = value));
+  const parsed = payload as SlackSlashCommandPayload;
 
   const slashCommandPayload = slackSlashCommandPayloadSchema.validate(parsed, {
     stripUnknown: true,