Revocation URL

- grabbing the revocation from the config or idp config
louketo · Feb 10, 2017 · 0436d07 · 0436d07
1 parent 1e5820c
commit 0436d07
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,12 @@
 
+#### **2.0.4**
+
+FEATURES:
+ * Grabbing the revocation-url from the idp config if user override is not specified [#PR193](https://github.com/gambol99/keycloak-proxy/pull/193)
+
 #### **2.0.3**
 
-FEATURES
+FEATURES:
  * Adding the PROXY_ENCRYPTION_KEY environment varable [#PR191](https://github.com/gambol99/keycloak-proxy/pull/191)
 
 #### **2.0.2**

diff --git a/handlers.go b/handlers.go
@@ -306,13 +306,14 @@ func (r *oauthProxy) logoutHandler(cx *gin.Context) {
 		}()
 	}
 
+	// step: get the revocation endpoint from either the idp and or the user config
+	revocationURL := defaultTo(r.config.RevocationEndpoint, r.idp.EndSessionEndpoint.String())
+
 	// step: do we have a revocation endpoint?
-	if r.config.RevocationEndpoint != "" {
+	if revocationURL != "" {
 		client, err := r.client.OAuthClient()
 		if err != nil {
-			log.WithFields(log.Fields{
-				"error": err.Error(),
-			}).Errorf("unable to retrieve the openid client")
+			log.WithFields(log.Fields{"error": err.Error()}).Errorf("unable to retrieve the openid client")
 
 			cx.AbortWithStatus(http.StatusInternalServerError)
 			return