updated to SECOAUTH-1.0.1-BUILD-SNAPSHOT

openid-connect-client/pom.xml

@@ -22,7 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     </dependency>
     <dependency>
       <groupId>org.springframework.security.oauth</groupId>
-      <version>1.0.0.BUILD-SNAPSHOT</version>
+      <version>1.0.1.BUILD-SNAPSHOT</version>
       <artifactId>spring-security-oauth2</artifactId>
     </dependency>
   </dependencies>

openid-connect-common/pom.xml

@@ -17,7 +17,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   <dependencies>
     <dependency>
       <groupId>org.springframework.security.oauth</groupId>
-      <version>1.0.0.BUILD-SNAPSHOT</version>
+      <version>1.0.1.BUILD-SNAPSHOT</version>
       <artifactId>spring-security-oauth2</artifactId>
     </dependency>
   </dependencies>

openid-connect-server/pom.xml

@@ -16,7 +16,7 @@
     <dependencies>
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
-			<version>1.0.0.BUILD-SNAPSHOT</version>
+			<version>1.0.1.BUILD-SNAPSHOT</version>
 			<artifactId>spring-security-oauth2</artifactId>
 		</dependency>  
 		<dependency>

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<String> 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<String> refreshScopes = refreshToken.getAuthenticationHolder().getAuthentication().getAuthorizationRequest().getScope();
 		
+		Set<String> scope = authRequest.getScope();
 		if (scope != null && !scope.isEmpty()) { 
 			// ensure a proper subset of scopes
 			if (refreshScopes != null && refreshScopes.containsAll(scope)) {

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;
+    }
 	
 }

spring-security-oauth

@@ -1 +1 @@
-Subproject commit 9615bd9a62da1946e2291a6b2663c0258bda4f82
+Subproject commit 16a40ae98cfc211502ffaabb86b59e1e0a597069