From 27f3bc0f4a5e34c92ab650f67757604139d1630b Mon Sep 17 00:00:00 2001 From: Fabi <38692350+fgerschwiler@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:21:09 +0100 Subject: [PATCH] fix: change callbackpath (#74) * fix: append client id to aud * handle new callback path Co-authored-by: Livio Amstutz --- example/server/default/default.go | 2 +- pkg/op/op.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/server/default/default.go b/example/server/default/default.go index d5922d4..7edaf2e 100644 --- a/example/server/default/default.go +++ b/example/server/default/default.go @@ -68,5 +68,5 @@ func HandleLogin(w http.ResponseWriter, r *http.Request) { func HandleCallback(w http.ResponseWriter, r *http.Request) { r.ParseForm() client := r.FormValue("client") - http.Redirect(w, r, "/authorize/"+client, http.StatusFound) + http.Redirect(w, r, "/authorize/callback?id="+client, http.StatusFound) } diff --git a/pkg/op/op.go b/pkg/op/op.go index 3d2fe41..d16848e 100644 --- a/pkg/op/op.go +++ b/pkg/op/op.go @@ -76,7 +76,7 @@ func CreateRouter(o OpenIDProvider, interceptors ...HttpInterceptor) *mux.Router router.HandleFunc(readinessEndpoint, readyHandler(o.Probes())) router.HandleFunc(oidc.DiscoveryEndpoint, discoveryHandler(o, o.Signer())) router.Handle(o.AuthorizationEndpoint().Relative(), intercept(authorizeHandler(o))) - router.Handle(o.AuthorizationEndpoint().Relative()+"/{id}", intercept(authorizeCallbackHandler(o))) + router.NewRoute().Path(o.AuthorizationEndpoint().Relative()+"/callback").Queries("id", "{id}").Handler(intercept(authorizeCallbackHandler(o))) router.Handle(o.TokenEndpoint().Relative(), intercept(tokenHandler(o))) router.HandleFunc(o.UserinfoEndpoint().Relative(), userinfoHandler(o)) router.Handle(o.EndSessionEndpoint().Relative(), intercept(endSessionHandler(o)))