Author: sergeyb
Date: Fri Nov 30 12:59:14 2012
New Revision: 1415609
URL: http://svn.apache.org/viewvc?rev=1415609&view=rev
Log:
[CXF-4666] Making it simpler to customize UserSubject creation
Modified:
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
Modified:
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java?rev=1415609&r1=1415608&r2=1415609&view=diff
==============================================================================
---
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
(original)
+++
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
Fri Nov 30 12:59:14 2012
@@ -242,8 +242,13 @@ public abstract class RedirectionBasedGr
this.sessionAuthenticityTokenProvider =
sessionAuthenticityTokenProvider;
}
- private UserSubject createUserSubject(SecurityContext securityContext) {
- return OAuthUtils.createSubject(securityContext);
+ protected UserSubject createUserSubject(SecurityContext securityContext) {
+ UserSubject subject =
getMessageContext().getContent(UserSubject.class);
+ if (subject != null) {
+ return subject;
+ } else {
+ return OAuthUtils.createSubject(securityContext);
+ }
}
protected abstract Response createErrorResponse(MultivaluedMap<String,
String> params,
