Events can now be received at both /events or `/events/<channel-nam…

…e>` endpoints

cmd/server/main.go

@@ -86,7 +86,18 @@ func run(ctx context.Context, args []string, env []string) error {
 
 	g.Go(func() error {
 		whmux := http.NewServeMux()
-		whmux.Handle(prefix+"/events", http.StripPrefix(prefix, webhook.New(sched)))
+
+		eventHandler := http.StripPrefix(prefix, webhook.New(sched))
+
+		// CASE: When the event is being received at '/events/<channel-name>' and the channel name
+		// gets extracted from the path parameter.
+		whmux.Handle(prefix+"/events/{chan}", eventHandler)
+
+		// DEPRECATED.
+		// CASE: When the event is being received at '/events' and the channel name gets extracted
+		// from the 'chan' query parameter.
+		whmux.Handle(prefix+"/events", eventHandler)
+
 		return listenAndServeContext(ctx, "webhook", webhookAddr, whmux)
 	})
 

http/webhook/handler.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/bluebrown/kobold/task"
+	"github.com/gorilla/mux"
 )
 
 type Webhook struct {
@@ -23,7 +24,18 @@ func (api *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "unable to read body", http.StatusBadRequest)
 		return
 	}
-	if err := api.s.Schedule(r.Context(), r.URL.Query().Get("chan"), buf.Bytes()); err != nil {
+
+	var channelName string
+
+	// Try to get the channel name from the path parameter. If not found in the path parameter, then
+	// get it from the query parameter.
+	muxVars := mux.Vars(r)
+	channelName = muxVars["chan"]
+	if len(channelName) == 0 {
+		channelName = r.URL.Query().Get("chan")
+	}
+
+	if err := api.s.Schedule(r.Context(), channelName, buf.Bytes()); err != nil {
 		http.Error(w, "internal error", http.StatusInternalServerError)
 		return
 	}