updated based on feedback

slackapi · Mar 26, 2020 · df236ef · df236ef
1 parent ef1adce
commit df236ef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/src/App.ts b/src/App.ts
@@ -61,6 +61,7 @@ const packageJson = require('../package.json'); // tslint:disable-line:no-requir
 export interface AppOptions {
  signingSecret?: ExpressReceiverOptions['signingSecret'];
  endpoints?: ExpressReceiverOptions['endpoints'];
+ processBeforeResponse?: ExpressReceiverOptions['processBeforeResponse'];
  agent?: Agent;
  clientTls?: Pick<SecureContextOptions, 'pfx' | 'key' | 'passphrase' | 'cert' | 'ca'>;
  convoStore?: ConversationStore | false;
@@ -73,7 +74,6 @@ export interface AppOptions {
  logLevel?: LogLevel;
  ignoreSelf?: boolean;
  clientOptions?: Pick<WebClientOptions, 'slackApiUrl'>;
- processBeforeResponse?: boolean;
 }
 
 export { LogLevel, Logger } from '@slack/logger';

diff --git a/src/ExpressReceiver.ts b/src/ExpressReceiver.ts
@@ -68,42 +68,31 @@ export default class ExpressReceiver implements Receiver {
  // tslint:disable-next-line: align
  }, 3001);
 
- let event: ReceiverEvent;
  let storedResponse = undefined;
- if (this.processBeforeResponse) {
- event = {
-  body: req.body,
- ack: async (response): Promise<void> => {
- if (isAcknowledged) {
-  throw new ReceiverMultipleAckError();
-  }
-  isAcknowledged = true;
+ const event: ReceiverEvent = {
+ body: req.body,
+ ack: async (response): Promise<void> => {
+ if (isAcknowledged) {
+ throw new ReceiverMultipleAckError();
+ }
+ isAcknowledged = true;
+ if (this.processBeforeResponse) {
  if (!response) {
- res.send('');
+ storedResponse = '';
  } else {
  storedResponse = response;
  }
- },
- };
-
- } else {
- event = {
- body: req.body,
- ack: async (response): Promise<void> => {
- if (isAcknowledged) {
- throw new ReceiverMultipleAckError();
- }
- isAcknowledged = true;
+ } else {
  if (!response) {
  res.send('');
  } else if (typeof response === 'string') {
  res.send(response);
  } else {
  res.json(response);
  }
- },
- };
- }
+ }
+ },
+ };
 
  try {
  await this.bolt?.processEvent(event);