From c577b691c73a8bcb6ccdd61580ebe2e1828fcfd0 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Wed, 12 Jun 2013 14:21:24 -0400 Subject: [PATCH] moved OIDC auth token and userinfo interception filter to common package, addresses #353 --- .../mitre/openid/connect/client/OIDCAuthenticationFilter.java | 1 + .../openid/connect/client/OIDCAuthenticationProvider.java | 1 + .../java/org/mitre/openid/connect/client/UserInfoFetcher.java | 1 + .../mitre/openid/connect/model}/OIDCAuthenticationToken.java | 3 +-- .../java/org/mitre/openid/connect/web/UserInfoInterceptor.java | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) rename {openid-connect-client/src/main/java/org/mitre/openid/connect/client => openid-connect-common/src/main/java/org/mitre/openid/connect/model}/OIDCAuthenticationToken.java (98%) rename {openid-connect-server => openid-connect-common}/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java (97%) diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java index e8ba9ce83..0e97afc63 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationFilter.java @@ -38,6 +38,7 @@ import org.mitre.openid.connect.client.service.ClientConfigurationService; import org.mitre.openid.connect.client.service.IssuerService; import org.mitre.openid.connect.client.service.ServerConfigurationService; import org.mitre.openid.connect.config.ServerConfiguration; +import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java index 266cb49ea..6be4e8bd1 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationProvider.java @@ -18,6 +18,7 @@ package org.mitre.openid.connect.client; import java.util.Collection; +import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.mitre.openid.connect.model.UserInfo; import org.springframework.beans.factory.InitializingBean; import org.springframework.security.authentication.AuthenticationProvider; diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java index 17a61cab6..2cdbd9db7 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/UserInfoFetcher.java @@ -19,6 +19,7 @@ package org.mitre.openid.connect.client; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.DefaultHttpClient; import org.mitre.openid.connect.model.DefaultUserInfo; +import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.mitre.openid.connect.model.UserInfo; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.util.LinkedMultiValueMap; diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java similarity index 98% rename from openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java rename to openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java index b839cb81a..aa16b08dc 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/OIDCAuthenticationToken.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/model/OIDCAuthenticationToken.java @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. ******************************************************************************/ -package org.mitre.openid.connect.client; +package org.mitre.openid.connect.model; import java.util.ArrayList; import java.util.Collection; import org.mitre.openid.connect.config.ServerConfiguration; -import org.mitre.openid.connect.model.UserInfo; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java similarity index 97% rename from openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java rename to openid-connect-common/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java index abc206d16..644e8ab01 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/web/UserInfoInterceptor.java @@ -24,7 +24,7 @@ import java.security.Principal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.mitre.openid.connect.client.OIDCAuthenticationToken; +import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.mitre.openid.connect.model.UserInfo; import org.mitre.openid.connect.service.UserInfoService; import org.springframework.beans.factory.annotation.Autowired;