From aceca791f43c64617ec18d0d929b3d2e7ed138e0 Mon Sep 17 00:00:00 2001
From: Stephen Wan <stephen.wan@opal.dev>
Date: Wed, 26 Oct 2022 12:07:12 -0500
Subject: [PATCH] slackevents: fix bug where enterprise id is not filled on
 inner events

Before this change, innerEvent.EnterpriseID was always empty string. Now,
it is filled when available from the outer event.
---
 slackevents/outer_events.go | 1 +
 slackevents/parsers.go      | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/slackevents/outer_events.go b/slackevents/outer_events.go
index 6277248dc..bcc85f331 100644
--- a/slackevents/outer_events.go
+++ b/slackevents/outer_events.go
@@ -35,6 +35,7 @@ type EventsAPICallbackEvent struct {
 	Token        string           `json:"token"`
 	TeamID       string           `json:"team_id"`
 	APIAppID     string           `json:"api_app_id"`
+	EnterpriseID string           `json:"enterprise_id"`
 	InnerEvent   *json.RawMessage `json:"event"`
 	AuthedUsers  []string         `json:"authed_users"`
 	AuthedTeams  []string         `json:"authed_teams"`
diff --git a/slackevents/parsers.go b/slackevents/parsers.go
index 23ba2b85b..96ba5681b 100644
--- a/slackevents/parsers.go
+++ b/slackevents/parsers.go
@@ -102,7 +102,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 			e.TeamID,
 			"unmarshalling_error",
 			e.APIAppID,
-			"",
+			e.EnterpriseID,
 			&slack.UnmarshallingErrorEvent{ErrorObj: err},
 			EventsAPIInnerEvent{},
 		}, err
@@ -114,7 +114,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 			e.TeamID,
 			iE.Type,
 			e.APIAppID,
-			"",
+			e.EnterpriseID,
 			nil,
 			EventsAPIInnerEvent{},
 		}, fmt.Errorf("Inner Event does not exist! %s", iE.Type)
@@ -128,7 +128,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 			e.TeamID,
 			"unmarshalling_error",
 			e.APIAppID,
-			"",
+			e.EnterpriseID,
 			&slack.UnmarshallingErrorEvent{ErrorObj: err},
 			EventsAPIInnerEvent{},
 		}, err
@@ -138,7 +138,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 		e.TeamID,
 		e.Type,
 		e.APIAppID,
-		"",
+		e.EnterpriseID,
 		e,
 		EventsAPIInnerEvent{iE.Type, recvEvent},
 	}, nil