diff --git a/openid-connect-client/pom.xml b/openid-connect-client/pom.xml index 29898ee32..1159368ee 100644 --- a/openid-connect-client/pom.xml +++ b/openid-connect-client/pom.xml @@ -22,7 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.springframework.security.oauth - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT spring-security-oauth2 diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml index 494c0225c..3418e1d4f 100644 --- a/openid-connect-common/pom.xml +++ b/openid-connect-common/pom.xml @@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.springframework.security.oauth - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT spring-security-oauth2 diff --git a/openid-connect-server/pom.xml b/openid-connect-server/pom.xml index c46319e42..658ac4f13 100644 --- a/openid-connect-server/pom.xml +++ b/openid-connect-server/pom.xml @@ -16,7 +16,7 @@ org.springframework.security.oauth - 1.0.0.BUILD-SNAPSHOT + 1.0.1.BUILD-SNAPSHOT spring-security-oauth2 diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java index 2bca05333..4c73d9621 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java @@ -140,7 +140,7 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi } @Override - public OAuth2AccessTokenEntity refreshAccessToken(String refreshTokenValue, Set scope) throws AuthenticationException { + public OAuth2AccessTokenEntity refreshAccessToken(String refreshTokenValue, AuthorizationRequest authRequest) throws AuthenticationException { OAuth2RefreshTokenEntity refreshToken = tokenRepository.getRefreshTokenByValue(refreshTokenValue); @@ -174,6 +174,7 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi // get the stored scopes from the authentication holder's authorization request; these are the scopes associated with the refresh token Set refreshScopes = refreshToken.getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getScope(); + Set scope = authRequest.getScope(); if (scope != null && !scope.isEmpty()) { // ensure a proper subset of scopes if (refreshScopes != null && refreshScopes.containsAll(scope)) { diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java index d3f297838..1e573cd85 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/token/TofuUserApprovalHandler.java @@ -168,5 +168,14 @@ public class TofuUserApprovalHandler implements UserApprovalHandler { return true; } + + // + // FIXME + // + @Override + public AuthorizationRequest updateBeforeApproval(AuthorizationRequest authorizationRequest, Authentication userAuthentication) { + // TODO Auto-generated method stub + return null; + } } diff --git a/spring-security-oauth b/spring-security-oauth index 9615bd9a6..16a40ae98 160000 --- a/spring-security-oauth +++ b/spring-security-oauth @@ -1 +1 @@ -Subproject commit 9615bd9a62da1946e2291a6b2663c0258bda4f82 +Subproject commit 16a40ae98cfc211502ffaabb86b59e1e0a597069