From 1adfd0e9be69a93c7f63bb7afc742c9fafe31aa3 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 6 Sep 2017 17:12:54 -0500 Subject: app type transition (#7167) --- api4/webhook.go | 60 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'api4/webhook.go') diff --git a/api4/webhook.go b/api4/webhook.go index 6d332e8fc..b98e054df 100644 --- a/api4/webhook.go +++ b/api4/webhook.go @@ -45,7 +45,7 @@ func createIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - channel, err := app.GetChannel(hook.ChannelId) + channel, err := c.App.GetChannel(hook.ChannelId) if err != nil { c.Err = err return @@ -58,13 +58,13 @@ func createIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - if channel.Type != model.CHANNEL_OPEN && !app.SessionHasPermissionToChannel(c.Session, channel.Id, model.PERMISSION_READ_CHANNEL) { + if channel.Type != model.CHANNEL_OPEN && !c.App.SessionHasPermissionToChannel(c.Session, channel.Id, model.PERMISSION_READ_CHANNEL) { c.LogAudit("fail - bad channel permissions") c.SetPermissionError(model.PERMISSION_READ_CHANNEL) return } - if incomingHook, err := app.CreateIncomingWebhookForChannel(c.Session.UserId, channel, hook); err != nil { + if incomingHook, err := c.App.CreateIncomingWebhookForChannel(c.Session.UserId, channel, hook); err != nil { c.Err = err return } else { @@ -90,7 +90,7 @@ func updateIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAudit("attempt") - oldHook, err := app.GetIncomingWebhook(hookId) + oldHook, err := c.App.GetIncomingWebhook(hookId) if err != nil { c.Err = err return @@ -116,19 +116,19 @@ func updateIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - channel, err := app.GetChannel(updatedHook.ChannelId) + channel, err := c.App.GetChannel(updatedHook.ChannelId) if err != nil { c.Err = err return } - if channel.Type != model.CHANNEL_OPEN && !app.SessionHasPermissionToChannel(c.Session, channel.Id, model.PERMISSION_READ_CHANNEL) { + if channel.Type != model.CHANNEL_OPEN && !c.App.SessionHasPermissionToChannel(c.Session, channel.Id, model.PERMISSION_READ_CHANNEL) { c.LogAudit("fail - bad channel permissions") c.SetPermissionError(model.PERMISSION_READ_CHANNEL) return } - if incomingHook, err := app.UpdateIncomingWebhook(oldHook, updatedHook); err != nil { + if incomingHook, err := c.App.UpdateIncomingWebhook(oldHook, updatedHook); err != nil { c.Err = err return } else { @@ -150,14 +150,14 @@ func getIncomingHooks(c *Context, w http.ResponseWriter, r *http.Request) { return } - hooks, err = app.GetIncomingWebhooksForTeamPage(teamId, c.Params.Page, c.Params.PerPage) + hooks, err = c.App.GetIncomingWebhooksForTeamPage(teamId, c.Params.Page, c.Params.PerPage) } else { if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_WEBHOOKS) { c.SetPermissionError(model.PERMISSION_MANAGE_WEBHOOKS) return } - hooks, err = app.GetIncomingWebhooksPage(c.Params.Page, c.Params.PerPage) + hooks, err = c.App.GetIncomingWebhooksPage(c.Params.Page, c.Params.PerPage) } if err != nil { @@ -180,18 +180,18 @@ func getIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { var hook *model.IncomingWebhook var channel *model.Channel - if hook, err = app.GetIncomingWebhook(hookId); err != nil { + if hook, err = c.App.GetIncomingWebhook(hookId); err != nil { c.Err = err return } else { - channel, err = app.GetChannel(hook.ChannelId) + channel, err = c.App.GetChannel(hook.ChannelId) if err != nil { c.Err = err return } if !app.SessionHasPermissionToTeam(c.Session, hook.TeamId, model.PERMISSION_MANAGE_WEBHOOKS) || - (channel.Type != model.CHANNEL_OPEN && !app.SessionHasPermissionToChannel(c.Session, hook.ChannelId, model.PERMISSION_READ_CHANNEL)) { + (channel.Type != model.CHANNEL_OPEN && !c.App.SessionHasPermissionToChannel(c.Session, hook.ChannelId, model.PERMISSION_READ_CHANNEL)) { c.LogAudit("fail - bad permissions") c.SetPermissionError(model.PERMISSION_MANAGE_WEBHOOKS) return @@ -214,23 +214,23 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { var hook *model.IncomingWebhook var channel *model.Channel - if hook, err = app.GetIncomingWebhook(hookId); err != nil { + if hook, err = c.App.GetIncomingWebhook(hookId); err != nil { c.Err = err return } else { - channel, err = app.GetChannel(hook.ChannelId) + channel, err = c.App.GetChannel(hook.ChannelId) if err != nil { c.Err = err return } if !app.SessionHasPermissionToTeam(c.Session, hook.TeamId, model.PERMISSION_MANAGE_WEBHOOKS) || - (channel.Type != model.CHANNEL_OPEN && !app.SessionHasPermissionToChannel(c.Session, hook.ChannelId, model.PERMISSION_READ_CHANNEL)) { + (channel.Type != model.CHANNEL_OPEN && !c.App.SessionHasPermissionToChannel(c.Session, hook.ChannelId, model.PERMISSION_READ_CHANNEL)) { c.LogAudit("fail - bad permissions") c.SetPermissionError(model.PERMISSION_MANAGE_WEBHOOKS) return } else { - if err = app.DeleteIncomingWebhook(hookId); err != nil { + if err = c.App.DeleteIncomingWebhook(hookId); err != nil { c.Err = err return } @@ -261,7 +261,7 @@ func updateOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - oldHook, err := app.GetOutgoingWebhook(toUpdateHook.Id) + oldHook, err := c.App.GetOutgoingWebhook(toUpdateHook.Id) if err != nil { c.Err = err return @@ -273,7 +273,7 @@ func updateOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - rhook, err := app.UpdateOutgoingWebhook(oldHook, toUpdateHook) + rhook, err := c.App.UpdateOutgoingWebhook(oldHook, toUpdateHook) if err != nil { c.Err = err return @@ -299,7 +299,7 @@ func createOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - if rhook, err := app.CreateOutgoingWebhook(hook); err != nil { + if rhook, err := c.App.CreateOutgoingWebhook(hook); err != nil { c.LogAudit("fail") c.Err = err return @@ -318,26 +318,26 @@ func getOutgoingHooks(c *Context, w http.ResponseWriter, r *http.Request) { var err *model.AppError if len(channelId) > 0 { - if !app.SessionHasPermissionToChannel(c.Session, channelId, model.PERMISSION_MANAGE_WEBHOOKS) { + if !c.App.SessionHasPermissionToChannel(c.Session, channelId, model.PERMISSION_MANAGE_WEBHOOKS) { c.SetPermissionError(model.PERMISSION_MANAGE_WEBHOOKS) return } - hooks, err = app.GetOutgoingWebhooksForChannelPage(channelId, c.Params.Page, c.Params.PerPage) + hooks, err = c.App.GetOutgoingWebhooksForChannelPage(channelId, c.Params.Page, c.Params.PerPage) } else if len(teamId) > 0 { if !app.SessionHasPermissionToTeam(c.Session, teamId, model.PERMISSION_MANAGE_WEBHOOKS) { c.SetPermissionError(model.PERMISSION_MANAGE_WEBHOOKS) return } - hooks, err = app.GetOutgoingWebhooksForTeamPage(teamId, c.Params.Page, c.Params.PerPage) + hooks, err = c.App.GetOutgoingWebhooksForTeamPage(teamId, c.Params.Page, c.Params.PerPage) } else { if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_WEBHOOKS) { c.SetPermissionError(model.PERMISSION_MANAGE_WEBHOOKS) return } - hooks, err = app.GetOutgoingWebhooksPage(c.Params.Page, c.Params.PerPage) + hooks, err = c.App.GetOutgoingWebhooksPage(c.Params.Page, c.Params.PerPage) } if err != nil { @@ -354,7 +354,7 @@ func getOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - hook, err := app.GetOutgoingWebhook(c.Params.HookId) + hook, err := c.App.GetOutgoingWebhook(c.Params.HookId) if err != nil { c.Err = err return @@ -383,7 +383,7 @@ func regenOutgoingHookToken(c *Context, w http.ResponseWriter, r *http.Request) return } - hook, err := app.GetOutgoingWebhook(c.Params.HookId) + hook, err := c.App.GetOutgoingWebhook(c.Params.HookId) if err != nil { c.Err = err return @@ -402,7 +402,7 @@ func regenOutgoingHookToken(c *Context, w http.ResponseWriter, r *http.Request) return } - if rhook, err := app.RegenOutgoingWebhookToken(hook); err != nil { + if rhook, err := c.App.RegenOutgoingWebhookToken(hook); err != nil { c.Err = err return } else { @@ -416,7 +416,7 @@ func deleteOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - hook, err := app.GetOutgoingWebhook(c.Params.HookId) + hook, err := c.App.GetOutgoingWebhook(c.Params.HookId) if err != nil { c.Err = err return @@ -435,7 +435,7 @@ func deleteOutgoingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := app.DeleteOutgoingWebhook(hook.Id); err != nil { + if err := c.App.DeleteOutgoingWebhook(hook.Id); err != nil { c.LogAudit("fail") c.Err = err return @@ -478,7 +478,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { return } - err := app.HandleIncomingWebhook(id, parsedRequest) + err := c.App.HandleIncomingWebhook(id, parsedRequest) if err != nil { c.Err = err return @@ -494,7 +494,7 @@ func commandWebhook(c *Context, w http.ResponseWriter, r *http.Request) { response := model.CommandResponseFromHTTPBody(r.Header.Get("Content-Type"), r.Body) - err := app.HandleCommandWebhook(id, response) + err := c.App.HandleCommandWebhook(id, response) if err != nil { c.Err = err return -- cgit v1.2.3-1-g7c22