X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d95130da47af9fd0290d3c8f80a0364faf74957..bdc069a04fd98529f5c79c6b8a7164fb9119723d:/lib/controller/handler.go

diff --git a/lib/controller/handler.go b/lib/controller/handler.go
index 28c616aa63..01f2161632 100644
--- 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,15 @@ 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.EnableBetaController14287 {
+	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("/login", rtr)
+		mux.Handle("/logout", rtr)
 	}
 
 	hs := http.NotFoundHandler()