You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2024/09/24 12:22:35 UTC

(sling-whiteboard) branch master updated: feat(oidc-rp): add support for OAuth connections

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 40c41056 feat(oidc-rp): add support for OAuth connections
40c41056 is described below

commit 40c41056313fea1cff0e619e92386c95a8541e64
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 24 14:21:53 2024 +0200

    feat(oidc-rp): add support for OAuth connections
    
    We also set the 'Accept' header for token requests since GitHub deviates from the spec.
---
 .../{OidcConnection.java => ClientConnection.java} | 11 ++--
 .../oauth_client/OAuthTokenRefresher.java          |  4 +-
 .../extensions/oauth_client/OAuthTokenStore.java   |  6 +-
 .../sling/extensions/oauth_client/OAuthUris.java   |  2 +-
 .../impl/JcrUserHomeOAuthTokenStore.java           | 14 ++---
 ...onnectionImpl.java => OAuthConnectionImpl.java} | 43 +++++++-------
 .../oauth_client/impl/OAuthTokenRefresherImpl.java | 23 +++-----
 .../oauth_client/impl/OidcCallbackServlet.java     | 51 ++++++++--------
 .../oauth_client/impl/OidcConnectionImpl.java      | 36 +++++++-----
 .../oauth_client/impl/OidcEntryPointServlet.java   | 50 +++++++---------
 .../oauth_client/impl/RedisOAuthTokenStore.java    |  8 +--
 .../oauth_client/impl/ResolvedOAuthConnection.java | 68 ++++++++++++++++++++++
 .../support/OAuthEnabledSlingServlet.java          |  6 +-
 .../impl/JcrUserHomeOAuthTokenStoreTest.java       |  4 +-
 .../servlets/oidc_rp/impl/MockOidcConnection.java  | 25 +++++++-
 .../oidc_rp/impl/OidcEntryPointServletTest.java    | 27 ++-------
 16 files changed, 217 insertions(+), 161 deletions(-)

diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OidcConnection.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/ClientConnection.java
similarity index 81%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OidcConnection.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/ClientConnection.java
index ca2f96a0..b1545a76 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OidcConnection.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/ClientConnection.java
@@ -16,13 +16,10 @@
  */
 package org.apache.sling.extensions.oauth_client;
 
-// TODO - bad name
-public interface OidcConnection {
+/**
+ * Identifies an OAuth or OIDC connection
+ */
+public interface ClientConnection {
 
     String name();
-    String baseUrl();
-    String clientId();
-    String clientSecret();
-    String[] scopes();
-    String[] additionalAuthorizationParameters();
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenRefresher.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenRefresher.java
index 5328fd89..ffeb0425 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenRefresher.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenRefresher.java
@@ -23,10 +23,10 @@ public interface OAuthTokenRefresher {
      * 
      * <p>It is the responsibility of the invoker to persist the returned tokens.</p> 
      * 
-     * @param connection The connection to start the OIDC flow for
+     * @param connection The connection to refresh the tokens for
      * @param refreshToken An existing refresh token
      * @return OAuth tokens
      * @throws OAuthException in case anything goes wrong
      */
-    OAuthTokens refreshTokens(OidcConnection connection, String refreshToken) throws OAuthException;
+    OAuthTokens refreshTokens(ClientConnection connection, String refreshToken) throws OAuthException;
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenStore.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenStore.java
index 16ea3ed7..f8de5f6a 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenStore.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthTokenStore.java
@@ -39,9 +39,9 @@ import org.apache.sling.api.resource.ResourceResolver;
  */
 public interface OAuthTokenStore {
 
-    OAuthToken getAccessToken(OidcConnection connection, ResourceResolver resolver) throws OAuthException;
+    OAuthToken getAccessToken(ClientConnection connection, ResourceResolver resolver) throws OAuthException;
     
-    OAuthToken getRefreshToken(OidcConnection connection, ResourceResolver resolver) throws OAuthException;
+    OAuthToken getRefreshToken(ClientConnection connection, ResourceResolver resolver) throws OAuthException;
     
-    void persistTokens(OidcConnection connection, ResourceResolver resolver, OAuthTokens tokens) throws OAuthException;
+    void persistTokens(ClientConnection connection, ResourceResolver resolver, OAuthTokens tokens) throws OAuthException;
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthUris.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthUris.java
index 11ca6f4e..35fa850d 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthUris.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/OAuthUris.java
@@ -36,7 +36,7 @@ public abstract class OAuthUris {
      * @return a local URI
      * @throws OAuthException in case anything goes wrong
      */
-    public static URI getOidcEntryPointUri(OidcConnection connection, SlingHttpServletRequest request, String redirectPath) throws OAuthException {
+    public static URI getOidcEntryPointUri(ClientConnection connection, SlingHttpServletRequest request, String redirectPath) throws OAuthException {
         StringBuilder uri = new StringBuilder();
         uri.append(request.getScheme()).append("://").append(request.getServerName());
         boolean needsExplicitPort = ( "https".equals(request.getScheme()) && request.getServerPort() != 443 )
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/JcrUserHomeOAuthTokenStore.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/JcrUserHomeOAuthTokenStore.java
index 30ec0ba1..1c854d9a 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/JcrUserHomeOAuthTokenStore.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/JcrUserHomeOAuthTokenStore.java
@@ -33,7 +33,7 @@ import org.apache.sling.extensions.oauth_client.OAuthException;
 import org.apache.sling.extensions.oauth_client.OAuthToken;
 import org.apache.sling.extensions.oauth_client.OAuthTokenStore;
 import org.apache.sling.extensions.oauth_client.OAuthTokens;
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.extensions.oauth_client.TokenState;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
@@ -50,7 +50,7 @@ public class JcrUserHomeOAuthTokenStore implements OAuthTokenStore {
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
     @Override
-    public OAuthToken getAccessToken(OidcConnection connection, ResourceResolver resolver) {
+    public OAuthToken getAccessToken(ClientConnection connection, ResourceResolver resolver) {
         try {
             User user = resolver.adaptTo(User.class);
 
@@ -71,7 +71,7 @@ public class JcrUserHomeOAuthTokenStore implements OAuthTokenStore {
         }
     }
 
-    private OAuthToken getToken(OidcConnection connection, User user, String propertyName) throws RepositoryException {
+    private OAuthToken getToken(ClientConnection connection, User user, String propertyName) throws RepositoryException {
 
         Value[] tokenValue = user.getProperty(propertyPath(connection, propertyName));
         if ( tokenValue == null )
@@ -84,7 +84,7 @@ public class JcrUserHomeOAuthTokenStore implements OAuthTokenStore {
     }
     
     @Override
-    public OAuthToken getRefreshToken(OidcConnection connection, ResourceResolver resolver) {
+    public OAuthToken getRefreshToken(ClientConnection connection, ResourceResolver resolver) {
         try {
             User user = resolver.adaptTo(User.class);
             
@@ -95,7 +95,7 @@ public class JcrUserHomeOAuthTokenStore implements OAuthTokenStore {
     }
     
     @Override
-    public void persistTokens(OidcConnection connection, ResourceResolver resolver, OAuthTokens tokens) {
+    public void persistTokens(ClientConnection connection, ResourceResolver resolver, OAuthTokens tokens) {
         try {
             User currentUser = resolver.adaptTo(User.class);
             Session session = resolver.adaptTo(Session.class);
@@ -128,11 +128,11 @@ public class JcrUserHomeOAuthTokenStore implements OAuthTokenStore {
         }
     }
 
-    private String propertyPath(OidcConnection connection, String propertyName) {
+    private String propertyPath(ClientConnection connection, String propertyName) {
         return nodePath(connection) + "/" + propertyName;
     }
 
-    private String nodePath(OidcConnection connection) {
+    private String nodePath(ClientConnection connection) {
         return "oauth-tokens/" + connection.name();
     }
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcConnectionImpl.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OAuthConnectionImpl.java
similarity index 75%
copy from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcConnectionImpl.java
copy to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OAuthConnectionImpl.java
index b1160bc4..c976eeb7 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcConnectionImpl.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OAuthConnectionImpl.java
@@ -16,7 +16,7 @@
  */
 package org.apache.sling.extensions.oauth_client.impl;
 
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
@@ -26,57 +26,56 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 
 // TODO - bad name
 @Component
-@Designate(ocd = OidcConnectionImpl.Config.class, factory = true)
-public class OidcConnectionImpl implements OidcConnection{
+@Designate(ocd = OAuthConnectionImpl.Config.class, factory = true)
+public class OAuthConnectionImpl implements ClientConnection {
 
-    @ObjectClassDefinition(name = "OpenID Connect connection details")
+    @ObjectClassDefinition(name = "OAuth connection details")
     public @interface Config {
         String name();
-        String baseUrl();
+        String authorizationEndpoint();
+        String tokenEndpoint();
         String clientId();
         @AttributeDefinition(type = AttributeType.PASSWORD) String clientSecret();
         String[] scopes();
         String[] additionalAuthorizationParameters();
         
-        String webconsole_configurationFactory_nameHint() default "Name: {name}, base URL: {baseUrl}, clientId: {clientId}";
+        String webconsole_configurationFactory_nameHint() default "Name: {name}, auth endpoint: {authorizationEndpoint}, clientId: {clientId}";
     }
 
-    private Config cfg;
+    private final Config cfg;
 
     @Activate
-    public OidcConnectionImpl(Config cfg) {
+    public OAuthConnectionImpl(Config cfg) {
         this.cfg = cfg;
     }
-
+    
     @Override
-    public String baseUrl() {
-        return cfg.baseUrl();
+    public String name() {
+        return cfg.name();
     }
 
-    @Override
+
+    public String authorizationEndpoint() {
+        return cfg.authorizationEndpoint();
+    }
+    
+    public String tokenEndpoint() {
+        return cfg.tokenEndpoint();
+    }
+    
     public String clientId() {
         return cfg.clientId();
     }
 
-    @Override
     public String clientSecret() {
         return cfg.clientSecret();
     }
 
-    @Override
     public String[] scopes() {
         return cfg.scopes();
     }
 
-    @Override
-    public String name() {
-        return cfg.name();
-    }
-
-    @Override
     public String[] additionalAuthorizationParameters() {
         return cfg.additionalAuthorizationParameters();
     }
-    
-
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OAuthTokenRefresherImpl.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OAuthTokenRefresherImpl.java
index 5bb37758..09fdf1c9 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OAuthTokenRefresherImpl.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OAuthTokenRefresherImpl.java
@@ -19,13 +19,11 @@ package org.apache.sling.extensions.oauth_client.impl;
 import java.io.IOException;
 import java.net.URI;
 
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.extensions.oauth_client.OAuthException;
 import org.apache.sling.extensions.oauth_client.OAuthTokenRefresher;
 import org.apache.sling.extensions.oauth_client.OAuthTokens;
-import org.apache.sling.extensions.oauth_client.OidcConnection;
-import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Reference;
 
 import com.nimbusds.oauth2.sdk.AccessTokenResponse;
 import com.nimbusds.oauth2.sdk.AuthorizationGrant;
@@ -43,32 +41,27 @@ import com.nimbusds.oauth2.sdk.token.Tokens;
 @Component
 public class OAuthTokenRefresherImpl implements OAuthTokenRefresher {
 
-    private final OidcProviderMetadataRegistry providerMetadataRegistry;
-
-    @Activate
-    public OAuthTokenRefresherImpl(@Reference OidcProviderMetadataRegistry providerMetadataRegistry) {
-        this.providerMetadataRegistry = providerMetadataRegistry;
-    }
-    
     @Override
-    public OAuthTokens refreshTokens(OidcConnection connection, String refreshToken2) {
+    public OAuthTokens refreshTokens(ClientConnection connection, String refreshToken2) {
         return Converter.toSlingOAuthTokens(refreshTokensInternal(connection, refreshToken2));
     }
     
-    public Tokens refreshTokensInternal(OidcConnection connection, String refreshToken2) {
+    public Tokens refreshTokensInternal(ClientConnection connection, String refreshToken2) {
 
          try {
             // Construct the grant from the saved refresh token
              RefreshToken refreshToken = new RefreshToken(refreshToken2);
              AuthorizationGrant refreshTokenGrant = new RefreshTokenGrant(refreshToken);
+             
+             ResolvedOAuthConnection conn = ResolvedOAuthConnection.resolve(connection);
             
              // The credentials to authenticate the client at the token endpoint
-             ClientID clientID = new ClientID(connection.clientId());
-             Secret clientSecret = new Secret(connection.clientSecret());
+             ClientID clientID = new ClientID(conn.clientId());
+             Secret clientSecret = new Secret(conn.clientSecret());
              ClientAuthentication clientAuth = new ClientSecretBasic(clientID, clientSecret);
             
              // The token endpoint
-             URI tokenEndpoint = providerMetadataRegistry.getProviderMetadata(connection.baseUrl()).getTokenEndpointURI();
+             URI tokenEndpoint = URI.create(conn.tokenEndpoint());
             
              // Make the token request
              TokenRequest request = new TokenRequest(tokenEndpoint, clientAuth, refreshTokenGrant);
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcCallbackServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcCallbackServlet.java
index 30119210..dcdaeef0 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcCallbackServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcCallbackServlet.java
@@ -38,9 +38,9 @@ import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.auth.core.AuthConstants;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.extensions.oauth_client.OAuthTokenStore;
 import org.apache.sling.extensions.oauth_client.OAuthTokens;
-import org.apache.sling.extensions.oauth_client.OidcConnection;
 import org.apache.sling.servlets.annotations.SlingServletPaths;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -50,17 +50,16 @@ import org.slf4j.LoggerFactory;
 
 import com.nimbusds.oauth2.sdk.AuthorizationCode;
 import com.nimbusds.oauth2.sdk.AuthorizationCodeGrant;
+import com.nimbusds.oauth2.sdk.AuthorizationResponse;
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.TokenErrorResponse;
 import com.nimbusds.oauth2.sdk.TokenRequest;
+import com.nimbusds.oauth2.sdk.TokenResponse;
 import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
 import com.nimbusds.oauth2.sdk.auth.Secret;
+import com.nimbusds.oauth2.sdk.http.HTTPRequest;
+import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.id.ClientID;
-import com.nimbusds.openid.connect.sdk.AuthenticationErrorResponse;
-import com.nimbusds.openid.connect.sdk.AuthenticationResponse;
-import com.nimbusds.openid.connect.sdk.AuthenticationResponseParser;
-import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
-import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 
 @Component(service = { Servlet.class },
     property = { AuthConstants.AUTH_REQUIREMENTS +"=" + OidcCallbackServlet.PATH }
@@ -73,9 +72,8 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
     private static final long serialVersionUID = 1L;
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
-    private final Map<String, OidcConnection> connections;
+    private final Map<String, ClientConnection> connections;
     private final OAuthTokenStore tokenStore;
-    private final OidcProviderMetadataRegistry metadataRegistry;
 
     static String getCallbackUri(HttpServletRequest request) {
         String portFragment = "";
@@ -88,11 +86,9 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
     }
 
     @Activate
-    public OidcCallbackServlet(@Reference(policyOption = GREEDY) List<OidcConnection> connections, @Reference OAuthTokenStore tokenStore,
-            @Reference OidcProviderMetadataRegistry metadataRegistry) {
+    public OidcCallbackServlet(@Reference(policyOption = GREEDY) List<ClientConnection> connections, @Reference OAuthTokenStore tokenStore) {
         this.connections = connections.stream()
-                .collect(Collectors.toMap( OidcConnection::name, Function.identity()));
-        this.metadataRegistry = metadataRegistry;
+                .collect(Collectors.toMap( ClientConnection::name, Function.identity()));
         this.tokenStore = tokenStore;
     }
 
@@ -104,12 +100,13 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
             if ( request.getQueryString() != null )
                 requestURL.append('?').append(request.getQueryString());
 
-            AuthenticationResponse authResponse = AuthenticationResponseParser.parse(new URI(requestURL.toString()));
+            AuthorizationResponse authResponse = AuthorizationResponse.parse(new URI(requestURL.toString()));
+            
             OAuthStateManager stateManager = OAuthStateManager.stateFor(request);
             if ( authResponse.getState() == null || !stateManager.isValidState(authResponse.getState()))
                 throw new ServletException("Failed state check");
 
-            if ( response instanceof AuthenticationErrorResponse )
+            if ( !authResponse.indicatesSuccess() )
                 throw new ServletException(authResponse.toErrorResponse().getErrorObject().toString());
 
             Optional<String> redirect = stateManager.getStateAttribute(authResponse.getState(), OAuthStateManager.PARAMETER_NAME_REDIRECT);
@@ -123,31 +120,37 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
                 response.sendError(HttpServletResponse.SC_BAD_REQUEST);  
                 return;
             }
-            OidcConnection connection = connections.get(desiredConnectionName.get());
+            ClientConnection connection = connections.get(desiredConnectionName.get());
             if ( connection == null ) {
                 logger.warn("Requested unknown connection {}", desiredConnectionName.get());
                 response.sendError(HttpServletResponse.SC_BAD_REQUEST);
                 return;
             }
-
-            if ( connection.baseUrl() == null )
-                throw new ServletException("Misconfigured baseUrl");
             
-            ClientID clientId = new ClientID(connection.clientId());
-            Secret clientSecret = new Secret(connection.clientSecret());
+            ResolvedOAuthConnection conn = ResolvedOAuthConnection.resolve(connection);
+
+            ClientID clientId = new ClientID(conn.clientId());
+            Secret clientSecret = new Secret(conn.clientSecret());
             ClientSecretBasic clientCredentials = new ClientSecretBasic(clientId, clientSecret);
             
             AuthorizationCode code = new AuthorizationCode(authCode);
             
-            OIDCProviderMetadata providerMetadata = metadataRegistry.getProviderMetadata(connection.baseUrl());
+            URI tokenEndpoint = new URI(conn.tokenEndpoint());
             
             TokenRequest tokenRequest = new TokenRequest(
-                providerMetadata.getTokenEndpointURI(),
+                tokenEndpoint,
                 clientCredentials,
                 new AuthorizationCodeGrant(code, new URI(getCallbackUri(request)))
             );
             
-            OIDCTokenResponse tokenResponse = OIDCTokenResponse.parse(tokenRequest.toHTTPRequest().send());
+            HTTPRequest httpRequest = tokenRequest.toHTTPRequest();
+            // GitHub requires an explicitly set Accept header, otherwise the response is url encoded
+            // https://docs.github.com/en/apps/oauth-apps/building-oauth-apps/authorizing-oauth-apps#2-users-are-redirected-back-to-your-site-by-github
+            // see also https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions/issues/107/support-application-x-www-form-urlencoded
+            httpRequest.setHeader("Accept", "application/json"); 
+            HTTPResponse httpResponse = httpRequest.send();
+            
+            TokenResponse tokenResponse = TokenResponse.parse(httpResponse);
             
             if ( !tokenResponse.indicatesSuccess() ) {
                 TokenErrorResponse errorResponse = tokenResponse.toErrorResponse();
@@ -157,7 +160,7 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
                 return;
             }
 
-            OAuthTokens tokens = Converter.toSlingOAuthTokens(tokenResponse.getOIDCTokens());
+            OAuthTokens tokens = Converter.toSlingOAuthTokens(tokenResponse.toSuccessResponse().getTokens());
             
             tokenStore.persistTokens(connection, request.getResourceResolver(), tokens);
 
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcConnectionImpl.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcConnectionImpl.java
index b1160bc4..6e9ed10c 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcConnectionImpl.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcConnectionImpl.java
@@ -16,9 +16,10 @@
  */
 package org.apache.sling.extensions.oauth_client.impl;
 
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
 import org.osgi.service.metatype.annotations.AttributeType;
 import org.osgi.service.metatype.annotations.Designate;
@@ -27,7 +28,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition;
 // TODO - bad name
 @Component
 @Designate(ocd = OidcConnectionImpl.Config.class, factory = true)
-public class OidcConnectionImpl implements OidcConnection{
+public class OidcConnectionImpl implements ClientConnection {
 
     @ObjectClassDefinition(name = "OpenID Connect connection details")
     public @interface Config {
@@ -41,42 +42,45 @@ public class OidcConnectionImpl implements OidcConnection{
         String webconsole_configurationFactory_nameHint() default "Name: {name}, base URL: {baseUrl}, clientId: {clientId}";
     }
 
-    private Config cfg;
+    private final Config cfg;
+    private final OidcProviderMetadataRegistry metadataRegistry;
 
     @Activate
-    public OidcConnectionImpl(Config cfg) {
+    public OidcConnectionImpl(Config cfg, @Reference OidcProviderMetadataRegistry metadataRegistry) {
         this.cfg = cfg;
+        this.metadataRegistry = metadataRegistry;
     }
-
+    
     @Override
+    public String name() {
+        return cfg.name();
+    }
+
     public String baseUrl() {
         return cfg.baseUrl();
     }
 
-    @Override
+    public String authorizationEndpoint() {
+        return metadataRegistry.getAuthorizationEndpoint(cfg.baseUrl()).toString();
+    }
+    
+    public String tokenEndpoint() {
+        return metadataRegistry.getTokenEndpoint(cfg.baseUrl()).toString();
+    }
+    
     public String clientId() {
         return cfg.clientId();
     }
 
-    @Override
     public String clientSecret() {
         return cfg.clientSecret();
     }
 
-    @Override
     public String[] scopes() {
         return cfg.scopes();
     }
 
-    @Override
-    public String name() {
-        return cfg.name();
-    }
-
-    @Override
     public String[] additionalAuthorizationParameters() {
         return cfg.additionalAuthorizationParameters();
     }
-    
-
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcEntryPointServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcEntryPointServlet.java
index 62d47960..9ede5cc5 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcEntryPointServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/OidcEntryPointServlet.java
@@ -22,7 +22,6 @@ import static org.osgi.service.component.annotations.ReferencePolicyOption.GREED
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -36,7 +35,7 @@ import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.auth.core.AuthConstants;
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.servlets.annotations.SlingServletPaths;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -44,13 +43,11 @@ import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.nimbusds.oauth2.sdk.AuthorizationRequest;
 import com.nimbusds.oauth2.sdk.ResponseType;
 import com.nimbusds.oauth2.sdk.Scope;
 import com.nimbusds.oauth2.sdk.id.ClientID;
 import com.nimbusds.oauth2.sdk.id.State;
-import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
-import com.nimbusds.openid.connect.sdk.Nonce;
-import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 
 @Component(service = { Servlet.class },
     property = { AuthConstants.AUTH_REQUIREMENTS +"=" + OidcEntryPointServlet.PATH }
@@ -63,16 +60,12 @@ public class OidcEntryPointServlet extends SlingAllMethodsServlet {
     
     private final Logger logger = LoggerFactory.getLogger(getClass());
     
-    private final Map<String, OidcConnection> connections;
-
-    private final OidcProviderMetadataRegistry oidcRegistry;
+    private final Map<String, ClientConnection> connections;
 
     @Activate
-    public OidcEntryPointServlet(@Reference(policyOption = GREEDY) List<OidcConnection> connections,
-            @Reference OidcProviderMetadataRegistry oidcRegistry) {
+    public OidcEntryPointServlet(@Reference(policyOption = GREEDY) List<ClientConnection> connections) {
         this.connections = connections.stream()
-                .collect(Collectors.toMap( OidcConnection::name, Function.identity()));
-        this.oidcRegistry = oidcRegistry;
+                .collect(Collectors.toMap( ClientConnection::name, Function.identity()));
     }
 
     @Override
@@ -86,25 +79,23 @@ public class OidcEntryPointServlet extends SlingAllMethodsServlet {
             return;
         }
 
-        OidcConnection connection = connections.get(desiredConnectionName);
+        ClientConnection connection = connections.get(desiredConnectionName);
         if ( connection == null ) {
             logger.debug("Client requested unknown connection {}; known: {}", desiredConnectionName, connections.keySet());
             response.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
-        
-        if ( connection.baseUrl() == null )
-            throw new ServletException("Misconfigured baseUrl");
             
         response.sendRedirect(getAuthenticationRequestUri(connection, request, URI.create(OidcCallbackServlet.getCallbackUri(request))).toString());
     }
     
-    private URI getAuthenticationRequestUri(OidcConnection connection, SlingHttpServletRequest request, URI redirectUri) {
-        OIDCProviderMetadata providerMetadata = oidcRegistry.getProviderMetadata(connection.baseUrl());
+    private URI getAuthenticationRequestUri(ClientConnection connection, SlingHttpServletRequest request, URI redirectUri) {
+        
+        ResolvedOAuthConnection conn = ResolvedOAuthConnection.resolve(connection);
 
         // The client ID provisioned by the OpenID provider when
         // the client was registered
-        ClientID clientID = new ClientID(connection.clientId());
+        ClientID clientID = new ClientID(conn.clientId());
 
         // Generate random state string to securely pair the callback to this request
         State state = new State();
@@ -114,20 +105,19 @@ public class OidcEntryPointServlet extends SlingAllMethodsServlet {
         if ( request.getParameter(PARAMETER_NAME_REDIRECT) != null )
             stateManager.putAttribute(state, PARAMETER_NAME_REDIRECT, request.getParameter(PARAMETER_NAME_REDIRECT));
 
-        // Generate nonce for the ID token
-        Nonce nonce = new Nonce();
+        URI authorizationEndpointUri = URI.create(conn.authorizationEndpoint());
 
         // Compose the OpenID authentication request (for the code flow)
-        AuthenticationRequest.Builder authRequestBuilder = new AuthenticationRequest.Builder(
-                new ResponseType("code"),
-                new Scope(connection.scopes()),
-                clientID, URI.create(OidcCallbackServlet.getCallbackUri(request)))
-            .endpointURI(providerMetadata.getAuthorizationEndpointURI())
-            .state(state)
-            .nonce(nonce);
+        AuthorizationRequest.Builder authRequestBuilder = new AuthorizationRequest.Builder(
+                ResponseType.CODE,
+                clientID)
+            .scope(new Scope(conn.scopes().toArray(new String[0])))
+            .endpointURI(authorizationEndpointUri)
+            .redirectionURI(redirectUri)
+            .state(state);
         
-        if ( connection.additionalAuthorizationParameters() != null ) {
-            Arrays.stream(connection.additionalAuthorizationParameters())
+        if ( conn.additionalAuthorizationParameters() != null ) {
+            conn.additionalAuthorizationParameters().stream()
                 .map( s -> s.split("=") )
                 .filter( p -> p.length == 2 )
                 .forEach( p -> authRequestBuilder.customParameter(p[0], p[1]));
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/RedisOAuthTokenStore.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/RedisOAuthTokenStore.java
index 882becd7..7d219ad2 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/RedisOAuthTokenStore.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/RedisOAuthTokenStore.java
@@ -23,7 +23,7 @@ import org.apache.sling.extensions.oauth_client.OAuthException;
 import org.apache.sling.extensions.oauth_client.OAuthToken;
 import org.apache.sling.extensions.oauth_client.OAuthTokenStore;
 import org.apache.sling.extensions.oauth_client.OAuthTokens;
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.extensions.oauth_client.TokenState;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -61,7 +61,7 @@ public class RedisOAuthTokenStore implements OAuthTokenStore {
     }
 
     @Override
-    public OAuthToken getAccessToken(OidcConnection connection, ResourceResolver resolver) throws OAuthException {
+    public OAuthToken getAccessToken(ClientConnection connection, ResourceResolver resolver) throws OAuthException {
         String userId = resolver.getUserID();
         
         try ( Jedis jedis = pool.getResource()) {
@@ -80,7 +80,7 @@ public class RedisOAuthTokenStore implements OAuthTokenStore {
     }
 
     @Override
-    public OAuthToken getRefreshToken(OidcConnection connection, ResourceResolver resolver) throws OAuthException {
+    public OAuthToken getRefreshToken(ClientConnection connection, ResourceResolver resolver) throws OAuthException {
         String userId = resolver.getUserID();
         
         try (Jedis jedis = pool.getResource()) {
@@ -94,7 +94,7 @@ public class RedisOAuthTokenStore implements OAuthTokenStore {
     }
 
     @Override
-    public void persistTokens(OidcConnection connection, ResourceResolver resolver, OAuthTokens tokens)
+    public void persistTokens(ClientConnection connection, ResourceResolver resolver, OAuthTokens tokens)
             throws OAuthException {
         String userId = resolver.getUserID();
 
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/ResolvedOAuthConnection.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/ResolvedOAuthConnection.java
new file mode 100644
index 00000000..49790949
--- /dev/null
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/impl/ResolvedOAuthConnection.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.extensions.oauth_client.impl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.sling.extensions.oauth_client.ClientConnection;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An OAuth connection that has all configuration parameters materialised
+ * 
+ * <p>Serves as an internal abstraction over the client-facing {@link ClientConnection} and its implementations.</p>
+ */
+public record ResolvedOAuthConnection(
+        String name,
+        String authorizationEndpoint,
+        String tokenEndpoint,
+        String clientId,
+        String clientSecret,
+        List<String> scopes,
+        List<String> additionalAuthorizationParameters) {
+    
+    public static ResolvedOAuthConnection resolve(@NotNull ClientConnection connection) {
+        
+        if ( connection instanceof OidcConnectionImpl impl ) {
+            return new ResolvedOAuthConnection(
+                    connection.name(), 
+                    impl.authorizationEndpoint(), 
+                    impl.tokenEndpoint(),
+                    impl.clientId(), 
+                    impl.clientSecret(), 
+                    Arrays.asList(impl.scopes()),
+                    Arrays.asList(impl.additionalAuthorizationParameters())
+                );
+        } else if ( connection instanceof OAuthConnectionImpl impl) {
+            return new ResolvedOAuthConnection(
+                    connection.name(), 
+                    impl.authorizationEndpoint(), 
+                    impl.tokenEndpoint(),
+                    impl.clientId(), 
+                    impl.clientSecret(), 
+                    Arrays.asList(impl.scopes()),
+                    Arrays.asList(impl.additionalAuthorizationParameters())
+                );
+        }
+        
+        throw new IllegalArgumentException(String.format("Unable to resolve %s (name=%s) of type %s", 
+                ClientConnection.class.getSimpleName(), connection.name(), connection.getClass().getName()));
+
+    }
+
+}
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/support/OAuthEnabledSlingServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/support/OAuthEnabledSlingServlet.java
index 33fe1030..dd335d4f 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/support/OAuthEnabledSlingServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oauth_client/support/OAuthEnabledSlingServlet.java
@@ -30,7 +30,7 @@ import org.apache.sling.extensions.oauth_client.OAuthTokenRefresher;
 import org.apache.sling.extensions.oauth_client.OAuthTokenStore;
 import org.apache.sling.extensions.oauth_client.OAuthTokens;
 import org.apache.sling.extensions.oauth_client.OAuthUris;
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.extensions.oauth_client.TokenState;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
@@ -42,13 +42,13 @@ public abstract class OAuthEnabledSlingServlet extends SlingSafeMethodsServlet {
 	
 	private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private final OidcConnection connection;
+    private final ClientConnection connection;
 
     private final OAuthTokenStore tokenStore;
 
     private final OAuthTokenRefresher oidcClient;
 	
-    protected OAuthEnabledSlingServlet(OidcConnection connection, OAuthTokenStore tokenStore, OAuthTokenRefresher oidcClient) {
+    protected OAuthEnabledSlingServlet(ClientConnection connection, OAuthTokenStore tokenStore, OAuthTokenRefresher oidcClient) {
         this.connection = Objects.requireNonNull(connection, "connection may not null");
         this.tokenStore = Objects.requireNonNull(tokenStore, "tokenStore may not null");
         this.oidcClient = Objects.requireNonNull(oidcClient, "oidcClient may not null");
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/JcrUserHomeOAuthTokenStoreTest.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/JcrUserHomeOAuthTokenStoreTest.java
index bf3ed895..697b5823 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/JcrUserHomeOAuthTokenStoreTest.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/JcrUserHomeOAuthTokenStoreTest.java
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.api.security.user.User;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.extensions.oauth_client.OAuthToken;
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.extensions.oauth_client.TokenState;
 import org.apache.sling.extensions.oauth_client.impl.Converter;
 import org.apache.sling.extensions.oauth_client.impl.JcrUserHomeOAuthTokenStore;
@@ -179,7 +179,7 @@ class JcrUserHomeOAuthTokenStoreTest {
             .isEqualTo( TokenState.MISSING);
     }
     
-    private Resource getConnectionResource(OidcConnection connection) throws RepositoryException {
+    private Resource getConnectionResource(ClientConnection connection) throws RepositoryException {
         String userPath = context.resourceResolver().adaptTo(User.class).getPath();
         Resource userHomeResource = context.resourceResolver().getResource(userPath);
         Resource oidcTokensResource = userHomeResource.getChild("oauth-tokens");
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java
index ec1392c6..0d35459d 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java
@@ -16,8 +16,27 @@
  */
 package org.apache.sling.servlets.oidc_rp.impl;
 
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import java.util.Map;
 
-record MockOidcConnection(String[] scopes, String name, String clientId, String clientSecret, String baseUrl, String[] additionalAuthorizationParameters) implements OidcConnection { 
-    static MockOidcConnection DEFAULT_CONNECTION = new MockOidcConnection(new String[] {"openid"}, "mock-oidc", "client-id", "client-secret", "http://example.com", new String[0]);
+import org.apache.sling.extensions.oauth_client.impl.OidcConnectionImpl;
+import org.osgi.util.converter.Converters;
+
+public class MockOidcConnection extends OidcConnectionImpl {
+    static MockOidcConnection DEFAULT_CONNECTION = new MockOidcConnection(new String[] {"openid"}, "mock-oidc", "client-id", "client-secret", "https://example.com", new String[0]);
+    
+    public MockOidcConnection(String[] scopes, String name, String clientId, String clientSecret, String baseUrl,
+            String[] additionalAuthorizationParameters) {
+        super(Converters.standardConverter().convert(Map.of("name", name, "baseUrl", baseUrl, "clientId", clientId, "clientSecret", clientSecret, "scopes", scopes, "additionalAuthorizationParameters", additionalAuthorizationParameters))
+                .to(Config.class), null);
+    }
+    
+    @Override
+    public String authorizationEndpoint() {
+        return baseUrl() + "/authorize";
+    }
+    
+    @Override
+    public String tokenEndpoint() {
+        return baseUrl() + "/token";
+    }
 }
\ No newline at end of file
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServletTest.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServletTest.java
index 89dd9fe3..af6baba1 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServletTest.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServletTest.java
@@ -21,15 +21,13 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.io.IOException;
 import java.net.URI;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
 import javax.servlet.ServletException;
 
-import org.apache.sling.extensions.oauth_client.OidcConnection;
+import org.apache.sling.extensions.oauth_client.ClientConnection;
 import org.apache.sling.extensions.oauth_client.impl.OidcEntryPointServlet;
-import org.apache.sling.extensions.oauth_client.impl.OidcProviderMetadataRegistry;
 import org.apache.sling.testing.mock.sling.junit5.SlingContext;
 import org.apache.sling.testing.mock.sling.junit5.SlingContextExtension;
 import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse;
@@ -37,17 +35,13 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
-import com.nimbusds.oauth2.sdk.id.Issuer;
-import com.nimbusds.openid.connect.sdk.SubjectType;
-import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
-
 @ExtendWith(SlingContextExtension.class)
 class OidcEntryPointServletTest {
 
     private static final String MOCK_OIDC_PARAM = "mock-oidc-param";
     
     private final SlingContext context = new SlingContext();
-    private List<OidcConnection> connections;
+    private List<ClientConnection> connections;
     private OidcEntryPointServlet servlet;
     
     @BeforeEach
@@ -56,17 +50,7 @@ class OidcEntryPointServletTest {
                 MockOidcConnection.DEFAULT_CONNECTION,
                 new MockOidcConnection(new String[] {"openid"}, MOCK_OIDC_PARAM, "client-id", "client-secret", "http://example.com", new String[] { "access_type=offline" } )
             );
-        servlet =  new OidcEntryPointServlet(connections, new OidcProviderMetadataRegistry() {
-            @Override
-            protected OIDCProviderMetadata getProviderMetadata(String base) {
-                return new OIDCProviderMetadata(new Issuer(base), Collections.singletonList(SubjectType.PUBLIC), URI.create("https://foo.example/jwks")) {
-                    @Override
-                    public URI getAuthorizationEndpointURI() {
-                        return URI.create("https://foo.example/authz");
-                    }
-                };
-            }
-        });
+        servlet =  new OidcEntryPointServlet(connections);
     }
     
     @Test
@@ -81,13 +65,12 @@ class OidcEntryPointServletTest {
         
         assertThat(location).as("authentication request uri")
             .hasScheme("https")
-            .hasHost("foo.example")
-            .hasPath("/authz")
+            .hasHost("example.com")
+            .hasPath("/authorize")
             .hasParameter("scope", "openid")
             .hasParameter("response_type", "code")
             .hasParameter("client_id", "client-id")
             .hasParameter("redirect_uri", "http://localhost/system/sling/oidc/callback")
-            .hasParameter("nonce")
             .hasParameter("state");        
     }