Merge pull request #969 from norabal/fix/add_enterprise_property

Add Enterprise Grid related property
slack-go · Sep 16, 2021 · 4981f65 · 4981f65
2 parents 09bb1e4 + 3760a81
commit 4981f65
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/interactions.go b/interactions.go
@@ -53,6 +53,7 @@ type InteractionCallback struct {
 	APIAppID        string          `json:"api_app_id"`
 	BlockID         string          `json:"block_id"`
 	Container       Container       `json:"container"`
+	Enterprise      Enterprise      `json:"enterprise"`
 	DialogSubmissionCallback
 	ViewSubmissionCallback
 	ViewClosedCallback
@@ -128,6 +129,11 @@ type Container struct {
 	IsAppUnfurl  bool        `json:"is_app_unfurl"`
 }
 
+type Enterprise struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+}
+
 // ActionCallback is a convenience struct defined to allow dynamic unmarshalling of
 // the "actions" value in Slack's JSON response, which varies depending on block type
 type ActionCallbacks struct {

diff --git a/slackevents/outer_events.go b/slackevents/outer_events.go
@@ -8,12 +8,13 @@ import (
 
 // EventsAPIEvent is the base EventsAPIEvent
 type EventsAPIEvent struct {
-	Token      string `json:"token"`
-	TeamID     string `json:"team_id"`
-	Type       string `json:"type"`
-	APIAppID   string `json:"api_app_id"`
-	Data       interface{}
-	InnerEvent EventsAPIInnerEvent
+	Token        string `json:"token"`
+	TeamID       string `json:"team_id"`
+	Type         string `json:"type"`
+	APIAppID     string `json:"api_app_id"`
+	EnterpriseID string `json:"enterprise_id"`
+	Data         interface{}
+	InnerEvent   EventsAPIInnerEvent
 }
 
 // EventsAPIURLVerificationEvent received when configuring a EventsAPI driven app

diff --git a/slackevents/parsers.go b/slackevents/parsers.go
@@ -39,6 +39,7 @@ func parseOuterEvent(rawE json.RawMessage) (EventsAPIEvent, error) {
 			"",
 			"unmarshalling_error",
 			"",
+			"",
 			&slack.UnmarshallingErrorEvent{ErrorObj: err},
 			EventsAPIInnerEvent{},
 		}, err
@@ -52,6 +53,7 @@ func parseOuterEvent(rawE json.RawMessage) (EventsAPIEvent, error) {
 				"",
 				"unmarshalling_error",
 				"",
+				"",
 				&slack.UnmarshallingErrorEvent{ErrorObj: err},
 				EventsAPIInnerEvent{},
 			}, err
@@ -61,6 +63,7 @@ func parseOuterEvent(rawE json.RawMessage) (EventsAPIEvent, error) {
 			e.TeamID,
 			e.Type,
 			e.APIAppID,
+			e.EnterpriseID,
 			cbEvent,
 			EventsAPIInnerEvent{},
 		}, nil
@@ -73,6 +76,7 @@ func parseOuterEvent(rawE json.RawMessage) (EventsAPIEvent, error) {
 			"",
 			"unmarshalling_error",
 			"",
+			"",
 			&slack.UnmarshallingErrorEvent{ErrorObj: err},
 			EventsAPIInnerEvent{},
 		}, err
@@ -82,6 +86,7 @@ func parseOuterEvent(rawE json.RawMessage) (EventsAPIEvent, error) {
 		e.TeamID,
 		e.Type,
 		e.APIAppID,
+		e.EnterpriseID,
 		urlVE,
 		EventsAPIInnerEvent{},
 	}, nil
@@ -97,6 +102,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 			e.TeamID,
 			"unmarshalling_error",
 			e.APIAppID,
+			"",
 			&slack.UnmarshallingErrorEvent{ErrorObj: err},
 			EventsAPIInnerEvent{},
 		}, err
@@ -108,6 +114,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 			e.TeamID,
 			iE.Type,
 			e.APIAppID,
+			"",
 			nil,
 			EventsAPIInnerEvent{},
 		}, fmt.Errorf("Inner Event does not exist! %s", iE.Type)
@@ -121,6 +128,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 			e.TeamID,
 			"unmarshalling_error",
 			e.APIAppID,
+			"",
 			&slack.UnmarshallingErrorEvent{ErrorObj: err},
 			EventsAPIInnerEvent{},
 		}, err
@@ -130,6 +138,7 @@ func parseInnerEvent(e *EventsAPICallbackEvent) (EventsAPIEvent, error) {
 		e.TeamID,
 		e.Type,
 		e.APIAppID,
+		"",
 		e,
 		EventsAPIInnerEvent{iE.Type, recvEvent},
 	}, nil
@@ -196,6 +205,7 @@ func ParseEvent(rawEvent json.RawMessage, opts ...Option) (EventsAPIEvent, error
 				"",
 				"unmarshalling_error",
 				"",
+				"",
 				&slack.UnmarshallingErrorEvent{ErrorObj: err},
 				EventsAPIInnerEvent{},
 			}, err
@@ -210,6 +220,7 @@ func ParseEvent(rawEvent json.RawMessage, opts ...Option) (EventsAPIEvent, error
 			"",
 			"unmarshalling_error",
 			"",
+			"",
 			&slack.UnmarshallingErrorEvent{ErrorObj: err},
 			EventsAPIInnerEvent{},
 		}, err
@@ -219,6 +230,7 @@ func ParseEvent(rawEvent json.RawMessage, opts ...Option) (EventsAPIEvent, error
 		e.TeamID,
 		e.Type,
 		e.APIAppID,
+		e.EnterpriseID,
 		urlVerificationEvent,
 		EventsAPIInnerEvent{},
 	}, nil