Chromium Code Reviews| Index: scheduler/appengine/frontend/handler.go |
| diff --git a/scheduler/appengine/frontend/handler.go b/scheduler/appengine/frontend/handler.go |
| index 7611d4094ace51dafa04ecb68f9fa2ff044cff6e..c7c0da090d50df0b27443249a750d6060f6cea5d 100644 |
| --- a/scheduler/appengine/frontend/handler.go |
| +++ b/scheduler/appengine/frontend/handler.go |
| @@ -30,10 +30,8 @@ import ( |
| "github.com/luci/luci-go/grpc/discovery" |
| "github.com/luci/luci-go/grpc/grpcmon" |
| "github.com/luci/luci-go/grpc/prpc" |
| - "github.com/luci/luci-go/server/auth" |
| "github.com/luci/luci-go/server/router" |
| - "github.com/luci/luci-go/appengine/gaeauth/server" |
| "github.com/luci/luci-go/appengine/gaemiddleware" |
| "github.com/luci/luci-go/common/data/rand/mathrand" |
| @@ -141,22 +139,20 @@ func init() { |
| PubSubPushPath: "/pubsub", |
| }) |
| - // Middleware chains. 'baseUI' is used for web interface routes, 'base' for |
| - // everything else. |
| + // Do global init before handling requests. |
| base := gaemiddleware.BaseProd().Extend( |
| func(c *router.Context, next router.Handler) { |
| globalInit.Do(func() { initializeGlobalState(c.Context) }) |
| next(c) |
| }, |
| ) |
| - baseUI := base.Extend(auth.Use(auth.Authenticator{server.CookieAuth})) |
|
Vadim Sh.
2017/04/18 23:46:24
moved to ui.InstallHandlers
|
| // Setup HTTP routes. |
| r := router.New() |
| gaemiddleware.InstallHandlersWithMiddleware(r, base) |
| - ui.InstallHandlers(r, baseUI, ui.Config{ |
| + ui.InstallHandlers(r, base, ui.Config{ |
| Engine: globalEngine, |
| Catalog: globalCatalog, |
| TemplatesPath: "templates", |