diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-19 13:55:47 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-06-19 10:55:47 -0700 |
| commit | ef9326bcbb461b4f3265f75a9f738e67e58b88d1 (patch) | |
| tree | 1d2abc5304be4df51762985753ede12749f3bf43 /api4/webhook.go | |
| parent | 1594cf8af102d0ffe7c62fc68004049e918a530a (diff) | |
| download | chat-ef9326bcbb461b4f3265f75a9f738e67e58b88d1.tar.gz chat-ef9326bcbb461b4f3265f75a9f738e67e58b88d1.tar.bz2 chat-ef9326bcbb461b4f3265f75a9f738e67e58b88d1.zip | |
Move integrations over to redux and v4 (#6679)
Diffstat (limited to 'api4/webhook.go')
| -rw-r--r-- | api4/webhook.go | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/api4/webhook.go b/api4/webhook.go index 6602c7a26..668636932 100644 --- a/api4/webhook.go +++ b/api4/webhook.go @@ -71,7 +71,7 @@ func updateIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - hookID := c.Params.HookId + hookId := c.Params.HookId updatedHook := model.IncomingWebhookFromJson(r.Body) if updatedHook == nil { @@ -81,12 +81,16 @@ func updateIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt") - oldHook, err := app.GetIncomingWebhook(hookID) + oldHook, err := app.GetIncomingWebhook(hookId) if err != nil { c.Err = err return } + if updatedHook.TeamId == "" { + updatedHook.TeamId = oldHook.TeamId + } + if updatedHook.TeamId != oldHook.TeamId { c.Err = model.NewAppError("updateIncomingHook", "api.webhook.team_mismatch.app_error", nil, "user_id="+c.Session.UserId, http.StatusBadRequest) return @@ -161,13 +165,13 @@ func getIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - hookID := c.Params.HookId + hookId := c.Params.HookId var err *model.AppError var hook *model.IncomingWebhook var channel *model.Channel - if hook, err = app.GetIncomingWebhook(hookID); err != nil { + if hook, err = app.GetIncomingWebhook(hookId); err != nil { c.Err = err return } else { @@ -195,13 +199,13 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - hookID := c.Params.HookId + hookId := c.Params.HookId var err *model.AppError var hook *model.IncomingWebhook var channel *model.Channel - if hook, err = app.GetIncomingWebhook(hookID); err != nil { + if hook, err = app.GetIncomingWebhook(hookId); err != nil { c.Err = err return } else { @@ -217,7 +221,7 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { c.SetPermissionError(model.PERMISSION_MANAGE_WEBHOOKS) return } else { - if err = app.DeleteIncomingWebhook(hookID); err != nil { + if err = app.DeleteIncomingWebhook(hookId); err != nil { c.Err = err return } |