Merge pull request #5517 from hashicorp/ui-handle-redirect

redirect ui to ui/
This commit is contained in:
Matthew Irish 2018-10-17 09:00:00 -05:00 committed by GitHub
commit ac13e4e554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -126,7 +126,8 @@ func Handler(props *vault.HandlerProperties) http.Handler {
} else {
mux.Handle("/ui/", handleUIHeaders(core, handleUIStub()))
}
mux.Handle("/", handleRootRedirect())
mux.Handle("/ui", handleUIRedirect())
mux.Handle("/", handleUIRedirect())
}
additionalRoutes(mux, core)
@ -181,7 +182,7 @@ func wrapGenericHandler(core *vault.Core, h http.Handler, maxRequestSize int64,
}
r = newR
case strings.HasPrefix(r.URL.Path, "/ui/"), r.URL.Path == "/":
case strings.HasPrefix(r.URL.Path, "/ui"), r.URL.Path == "/":
default:
respondError(w, http.StatusNotFound, nil)
cancelFunc()
@ -364,7 +365,7 @@ func handleUIStub() http.Handler {
})
}
func handleRootRedirect() http.Handler {
func handleUIRedirect() http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
http.Redirect(w, req, "/ui/", 307)
return