diff options
| -rw-r--r-- | api4/webhook.go | 17 | ||||
| -rw-r--r-- | api4/webhook_test.go | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/api4/webhook.go b/api4/webhook.go index ef68fd9fe..e34cc4137 100644 --- a/api4/webhook.go +++ b/api4/webhook.go @@ -31,6 +31,7 @@ func InitWebhook() { BaseRoutes.OutgoingHook.Handle("", ApiSessionRequired(deleteOutgoingHook)).Methods("DELETE") BaseRoutes.OutgoingHook.Handle("/regen_token", ApiSessionRequired(regenOutgoingHookToken)).Methods("POST") + BaseRoutes.Root.Handle("/hooks/commands/{id:[A-Za-z0-9]+}", ApiHandler(commandWebhook)).Methods("POST") BaseRoutes.Root.Handle("/hooks/{id:[A-Za-z0-9]+}", ApiHandler(incomingWebhook)).Methods("POST") // Old endpoint for backwards compatibility @@ -486,3 +487,19 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain") w.Write([]byte("ok")) } + +func commandWebhook(c *Context, w http.ResponseWriter, r *http.Request) { + params := mux.Vars(r) + id := params["id"] + + response := model.CommandResponseFromHTTPBody(r.Header.Get("Content-Type"), r.Body) + + err := app.HandleCommandWebhook(id, response) + if err != nil { + c.Err = err + return + } + + w.Header().Set("Content-Type", "text/plain") + w.Write([]byte("ok")) +} diff --git a/api4/webhook_test.go b/api4/webhook_test.go index 80328e373..8cab85c99 100644 --- a/api4/webhook_test.go +++ b/api4/webhook_test.go @@ -924,7 +924,7 @@ func TestCommandWebhooks(t *testing.T) { } for i := 0; i < 5; i++ { - if _, err := http.Post(Client.Url+"/hooks/commands/"+hook.Id, "application/json", bytes.NewBufferString("{\"text\":\"this is a test\"}")); err != nil { + if resp, err := http.Post(Client.Url+"/hooks/commands/"+hook.Id, "application/json", bytes.NewBufferString("{\"text\":\"this is a test\"}")); err != nil || resp.StatusCode != http.StatusOK { t.Fatal(err) } } |