diff --git a/openid-connect-common/pom.xml b/openid-connect-common/pom.xml
index 68370fe90..f5b7f0b64 100644
--- a/openid-connect-common/pom.xml
+++ b/openid-connect-common/pom.xml
@@ -60,7 +60,7 @@
org.springframework.security.oauth
- 2.0.0.M2
+ 2.0.2.RELEASE
spring-security-oauth2
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
index c7ed19684..fae822841 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/ConnectOAuth2RequestFactory.java
@@ -36,7 +36,7 @@ import org.springframework.security.oauth2.common.exceptions.InvalidClientExcept
import org.springframework.security.oauth2.common.exceptions.OAuth2Exception;
import org.springframework.security.oauth2.common.util.OAuth2Utils;
import org.springframework.security.oauth2.provider.AuthorizationRequest;
-import org.springframework.security.oauth2.provider.DefaultOAuth2RequestFactory;
+import org.springframework.security.oauth2.provider.request.DefaultOAuth2RequestFactory;
import org.springframework.stereotype.Component;
import com.google.gson.JsonElement;
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 0e84594d0..df95a6aff 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
@@ -19,6 +19,7 @@ package org.mitre.openid.connect.token;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -276,5 +277,14 @@ public class TofuUserApprovalHandler implements UserApprovalHandler {
}
}
}
+
+ @Override
+ public Map getUserApprovalRequest(AuthorizationRequest authorizationRequest,
+ Authentication userAuthentication) {
+ Map model = new HashMap();
+ // In case of a redirect we might want the request parameters to be included
+ model.putAll(authorizationRequest.getRequestParameters());
+ return model;
+ }
}