Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #560 from ericchiang/fix-user-api

Browse source 
server: fix the path registration for user APIs at non-root URLs
This commit is contained in:
Eric Chiang 2016-08-18 17:03:20 -07:00 committed by GitHub
commit 7525e5623c
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/server.go
View file

@ -215,6 +215,8 @@ func (s *Server) HTTPHandler() http.Handler {
clock := clockwork.NewRealClock() clock := clockwork.NewRealClock()
mux := http.NewServeMux() mux := http.NewServeMux()
// Handler methods which register handlers at prefixed paths.
handle := func(urlPath string, h http.Handler) { handle := func(urlPath string, h http.Handler) {
p := path.Join(s.IssuerURL.Path, urlPath) p := path.Join(s.IssuerURL.Path, urlPath)
// path.Join always trims trailing slashes (https://play.golang.org/p/GRr0jDd9P7). // path.Join always trims trailing slashes (https://play.golang.org/p/GRr0jDd9P7).
@ -227,6 +229,14 @@ func (s *Server) HTTPHandler() http.Handler {
handleFunc := func(urlPath string, hf http.HandlerFunc) { handleFunc := func(urlPath string, hf http.HandlerFunc) {
handle(urlPath, hf) handle(urlPath, hf)
} }
handleStripPrefix := func(urlPath string, h http.Handler) {
if s.IssuerURL.Path != "" {
handle(urlPath, http.StripPrefix(s.IssuerURL.Path, h))
} else {
handle(urlPath, h)
}
}
handleFunc(httpPathDiscovery, handleDiscoveryFunc(s.ProviderConfig())) handleFunc(httpPathDiscovery, handleDiscoveryFunc(s.ProviderConfig()))
handleFunc(httpPathAuth, handleAuthFunc(s, s.Connectors, s.LoginTemplate, s.EnableRegistration)) handleFunc(httpPathAuth, handleAuthFunc(s, s.Connectors, s.LoginTemplate, s.EnableRegistration))
handleFunc(httpPathOOB, handleOOBFunc(s, s.OOBTemplate)) handleFunc(httpPathOOB, handleOOBFunc(s, s.OOBTemplate))
@ -293,7 +303,7 @@ func (s *Server) HTTPHandler() http.Handler {
usersAPI := usersapi.NewUsersAPI(s.UserManager, s.ClientManager, s.RefreshTokenRepo, s.UserEmailer, s.localConnectorID) usersAPI := usersapi.NewUsersAPI(s.UserManager, s.ClientManager, s.RefreshTokenRepo, s.UserEmailer, s.localConnectorID)
handler := NewUserMgmtServer(usersAPI, s.JWTVerifierFactory(), s.UserManager, s.ClientManager).HTTPHandler() handler := NewUserMgmtServer(usersAPI, s.JWTVerifierFactory(), s.UserManager, s.ClientManager).HTTPHandler()
handle(apiBasePath+"/", handler) handleStripPrefix(apiBasePath+"/", handler)
return http.Handler(mux) return http.Handler(mux)
} }