Fix webhook content type for custom templates (TykTechnologies#2393)

Addition to TykTechnologies#2371
backwardn · Jul 10, 2019 · 1d3d3f5 · 1d3d3f5
1 parent 36848bf
commit 1d3d3f5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/gateway/event_handler_webhooks.go b/gateway/event_handler_webhooks.go
@@ -39,8 +39,8 @@ type WebHookHandler struct {
 	template *template.Template // non-nil if Init is run without error
 	store    storage.Handler
 
-	useDefaultTemplate bool
-	dashboardService   DashboardServiceSender
+	contentType      string
+	dashboardService DashboardServiceSender
 }
 
 // createConfigObject by default tyk will provide a map[string]interface{} type as a conf, converting it
@@ -82,6 +82,10 @@ func (w *WebHookHandler) Init(handlerConf interface{}) error {
 				"target": w.conf.TargetPath,
 			}).Warning("Custom template load failure, using default: ", err)
 		}
+
+		if strings.HasSuffix(w.conf.TemplatePath, ".json") {
+			w.contentType = "application/json"
+		}
 	}
 
 	// We use the default if TemplatePath was empty or if we failed
@@ -99,7 +103,7 @@ func (w *WebHookHandler) Init(handlerConf interface{}) error {
 			}).Error("Could not load the default template: ", err)
 			return err
 		}
-		w.useDefaultTemplate = true
+		w.contentType = "application/json"
 	}
 
 	log.WithFields(logrus.Fields{
@@ -190,8 +194,8 @@ func (w *WebHookHandler) BuildRequest(reqBody string) (*http.Request, error) {
 		req.Header.Set(key, val)
 	}
 
-	if req.Header.Get("Content-Type") == "" && w.useDefaultTemplate {
-		req.Header.Set("Content-Type", "application/json")
+	if req.Header.Get("Content-Type") == "" {
+		req.Header.Set("Content-Type", w.contentType)
 	}
 
 	return req, nil

diff --git a/gateway/event_handler_webhooks_test.go b/gateway/event_handler_webhooks_test.go
@@ -13,7 +13,7 @@ func createGetHandler() *WebHookHandler {
 		TargetPath:   TestHttpGet,
 		Method:       "GET",
 		EventTimeout: 10,
-		TemplatePath: "templates/default_webhook.json",
+		TemplatePath: "../templates/default_webhook.json",
 		HeaderList:   map[string]string{"x-tyk-test": "TEST"},
 	}
 	ev := &WebHookHandler{}
@@ -28,7 +28,7 @@ func TestNewValid(t *testing.T) {
 	err := h.Init(map[string]interface{}{
 		"method":        "POST",
 		"target_path":   testHttpPost,
-		"template_path": "templates/default_webhook.json",
+		"template_path": "../templates/default_webhook.json",
 		"header_map":    map[string]string{"X-Tyk-Test-Header": "Tyk v1.BANANA"},
 		"event_timeout": 10,
 	})
@@ -42,7 +42,7 @@ func TestNewInvalid(t *testing.T) {
 	err := h.Init(map[string]interface{}{
 		"method":        123,
 		"target_path":   testHttpPost,
-		"template_path": "templates/default_webhook.json",
+		"template_path": "../templates/default_webhook.json",
 		"header_map":    map[string]string{"X-Tyk-Test-Header": "Tyk v1.BANANA"},
 		"event_timeout": 10,
 	})