16212: Don't forward users/authenticate to Rails in legacy mode.
authorTom Clegg <tom@tomclegg.ca>
Wed, 1 Apr 2020 15:49:16 +0000 (11:49 -0400)
committerTom Clegg <tom@tomclegg.ca>
Wed, 1 Apr 2020 15:49:16 +0000 (11:49 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

lib/controller/handler.go

index d7bc9bd9a2468f4f54b205f9ff1f0618d4bdca8e..d62ffe2fd40036af86fd65af1823931e22311259 100644 (file)
@@ -79,13 +79,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)
        }