From 4c1ddcff10b359baf5728b334acb60cc3e1b1123 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 6 Jul 2018 06:07:09 -0700 Subject: MM-10703 Adding blank request context to plugin hooks for future use. (#9043) * Adding blank request context to plugin hooks for future use. * Rename RequestContext to Context * Adding context to ServeHTTP and ExecuteCommand * Fixing import cycle in test. --- app/plugin_requests.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/plugin_requests.go') diff --git a/app/plugin_requests.go b/app/plugin_requests.go index b7515d950..10ef758b4 100644 --- a/app/plugin_requests.go +++ b/app/plugin_requests.go @@ -10,6 +10,7 @@ import ( "github.com/gorilla/mux" "github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/model" + "github.com/mattermost/mattermost-server/plugin" ) func (a *App) ServePluginRequest(w http.ResponseWriter, r *http.Request) { @@ -33,7 +34,7 @@ func (a *App) ServePluginRequest(w http.ResponseWriter, r *http.Request) { a.servePluginRequest(w, r, hooks.ServeHTTP) } -func (a *App) servePluginRequest(w http.ResponseWriter, r *http.Request, handler http.HandlerFunc) { +func (a *App) servePluginRequest(w http.ResponseWriter, r *http.Request, handler func(*plugin.Context, http.ResponseWriter, *http.Request)) { token := "" authHeader := r.Header.Get(model.HEADER_AUTH) @@ -71,5 +72,5 @@ func (a *App) servePluginRequest(w http.ResponseWriter, r *http.Request, handler r.URL.RawQuery = newQuery.Encode() r.URL.Path = strings.TrimPrefix(r.URL.Path, "/plugins/"+params["plugin_id"]) - handler(w, r) + handler(plugin.NewBlankContext(), w, r) } -- cgit v1.2.3-1-g7c22