[KEYCLOAK-10633] Fix oauth uri slash issue when using base-uri

louketo · Mar 22, 2020 · 01956b7 · 01956b7
1 parent 008527a
commit 01956b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config.go b/config.go
@@ -77,10 +77,10 @@ func newDefaultConfig() *Config {
 // WithOAuthURI returns the oauth uri
 func (r *Config) WithOAuthURI(uri string) string {
 	if r.BaseURI != "" {
-		return fmt.Sprintf("%s/%s/%s", r.BaseURI, r.OAuthURI, uri)
+		return fmt.Sprintf("%s%s%s", r.BaseURI, r.OAuthURI, uri)
 	}
 
-	return fmt.Sprintf("%s/%s", r.OAuthURI, uri)
+	return fmt.Sprintf("%s%s", r.OAuthURI, uri)
 }
 
 // isValid validates if the config is valid

diff --git a/handlers.go b/handlers.go
@@ -63,7 +63,7 @@ func (r *oauthProxy) getRedirectionURL(w http.ResponseWriter, req *http.Request)
 		w.WriteHeader(http.StatusForbidden)
 		return ""
 	}
-	return fmt.Sprintf("%s%s", redirect, r.config.WithOAuthURI("callback"))
+	return fmt.Sprintf("%s%s", redirect, r.config.WithOAuthURI(callbackURL))
 }
 
 // oauthAuthorizationHandler is responsible for performing the redirection to oauth provider