Merge branch '16212-pam-login'

[arvados.git] / lib / controller / handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index d7bc9bd9a2468f4f54b205f9ff1f0618d4bdca8e..01f2161632bf8e6562f51b4266e43602b90218c6 100644 (file)
--- a/lib/controller/handler.go
+++ b/lib/controller/handler.go
@@ -67,6 +67,10 @@ func (h *Handler) CheckHealth() error {
        return err
 }
 
+func (h *Handler) Done() <-chan struct{} {
+       return nil
+}
+
 func neverRedirect(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }
 
 func (h *Handler) setup() {
@@ -79,13 +83,13 @@ func (h *Handler) setup() {
 
        rtr := router.New(federation.New(h.Cluster))
        mux.Handle("/arvados/v1/config", rtr)
+       mux.Handle("/"+arvados.EndpointUserAuthenticate.Path, rtr)
 
        if !h.Cluster.ForceLegacyAPI14 {
                mux.Handle("/arvados/v1/collections", rtr)
                mux.Handle("/arvados/v1/collections/", rtr)
                mux.Handle("/arvados/v1/users", rtr)
                mux.Handle("/arvados/v1/users/", rtr)
-               mux.Handle("/"+arvados.EndpointUserAuthenticate.Path, rtr)
                mux.Handle("/login", rtr)
                mux.Handle("/logout", rtr)
        }