Make HTTP middleware easier to use

appengine/gaeauth/server/default.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package server
 
 import (
         "runtime"
         "strings"
 
-        "github.com/julienschmidt/httprouter"
         "golang.org/x/net/context"
         "google.golang.org/appengine"
 
         gae_info "github.com/luci/gae/service/info"
         "github.com/luci/luci-go/server/auth"
         "github.com/luci/luci-go/server/auth/info"
         "github.com/luci/luci-go/server/auth/openid"
         "github.com/luci/luci-go/server/auth/signing"
-        "github.com/luci/luci-go/server/middleware"
+        "github.com/luci/luci-go/server/router"
 
         "github.com/luci/luci-go/appengine/gaeauth/server/internal/authdb"
 )
 
 // CookieAuth is default cookie-based auth method to use on GAE.
 //
 // On dev server it is based on dev server cookies, in prod it is based on
 // OpenID. Works only if appropriate handlers have been installed into
 // the router. See InstallHandlers.
 var CookieAuth auth.Method
 
 // InstallWebHandlers installs HTTP handlers for various default routes related
 // to authentication system.
 //
 // Must be installed in server HTTP router for authentication to work.
 //
 // TODO(vadimsh): Rename to InstallHandlers after June 1 2016. It was renamed
 // to purposely break code that called it (since its semantics has changed).
-func InstallWebHandlers(r *httprouter.Router, base middleware.Base) {
+func InstallWebHandlers(r *router.Router, handlers []router.Handler) {
         m := CookieAuth.(cookieAuthMethod)
         if oid, ok := m.Method.(*openid.AuthMethod); ok {
-                oid.InstallHandlers(r, base)
+                oid.InstallHandlers(r, handlers)
         }
-        auth.InstallHandlers(r, base)
-        authdb.InstallHandlers(r, base)
-        info.InstallHandlers(r, base, getServiceInfo)
-        signing.InstallHandlers(r, base)
+        auth.InstallHandlers(r, handlers)
+        authdb.InstallHandlers(r, handlers)
+        info.InstallHandlers(r, handlers, getServiceInfo)
+        signing.InstallHandlers(r, handlers)
 }
 
 // Warmup prepares local caches. It's optional.
 func Warmup(c context.Context) error {
         m := CookieAuth.(cookieAuthMethod)
         if oid, ok := m.Method.(*openid.AuthMethod); ok {
                 return oid.Warmup(c)
         }
         return nil
 }
@@ skipping 35 matching lines @@
                 CookieAuth = cookieAuthMethod{UsersAPIAuthMethod{}}
         } else {
                 CookieAuth = cookieAuthMethod{
                         &openid.AuthMethod{
                                 SessionStore:        &SessionStore{Prefix: "openid"},
                                 IncompatibleCookies: []string{"SACSID", "dev_appserver_login"},
                         },
                 }
         }
 }