Merge pull request #1253 from krashidov/respond500

returning 500 status code under error conditions
howdyai · Mar 15, 2018 · 8f2988c · 8f2988c
2 parents 2d64825 + 0ba0adb
commit 8f2988c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/SlackBot.js b/lib/SlackBot.js
@@ -200,14 +200,14 @@ function Slackbot(configuration) {
         slack_botkit.findAppropriateTeam(payload, function(err, team) {
             if (err) {
                 slack_botkit.log.error('Could not load team while processing webhook: ', err);
-                return;
+                return res.status(500).send();
             } else if (!team) {
                 // if this is NOT a slack app, it is ok to spawn a generic bot
                 // this is only likely to happen with custom slash commands
                 if (!slack_botkit.config.clientId) {
                     bot = slack_botkit.spawn({});
                 } else {
-                    return;
+                    return res.status(500).send();
                 }
             } else {
                 // spawn a bot
@@ -223,7 +223,7 @@ function Slackbot(configuration) {
 
                     if (!team.bot) {
                         slack_botkit.log.error('No bot identity found.');
-                        return;
+                        return res.status(500).send();
                     }
 
                 }