You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/08/28 16:00:14 UTC
svn commit: r1518208 - in
/cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services:
AbstractTokenService.java AuthorizationCodeGrantService.java
Author: sergeyb
Date: Wed Aug 28 14:00:14 2013
New Revision: 1518208
URL: http://svn.apache.org/r1518208
Log:
Support public clients having redirect URIs
Modified:
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java
cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.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/AbstractTokenService.java?rev=1518208&r1=1518207&r2=1518208&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractTokenService.java Wed Aug 28 14:00:14 2013
@@ -89,7 +89,6 @@ public class AbstractTokenService extend
if (canSupportPublicClients
&& !client.isConfidential()
&& client.getClientSecret() == null
- && client.getRedirectUris().isEmpty()
&& clientSecret == null) {
return client;
}
Modified: cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.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/AuthorizationCodeGrantService.java?rev=1518208&r1=1518207&r2=1518208&view=diff
==============================================================================
--- cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java (original)
+++ cxf/trunk/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java Wed Aug 28 14:00:14 2013
@@ -125,13 +125,12 @@ public class AuthorizationCodeGrantServi
@Override
protected boolean canSupportPublicClient(Client c) {
- return canSupportPublicClients && !c.isConfidential()
- && c.getClientSecret() == null && c.getRedirectUris().isEmpty();
+ return canSupportPublicClients && !c.isConfidential() && c.getClientSecret() == null;
}
@Override
protected boolean canRedirectUriBeEmpty(Client c) {
- return canSupportPublicClient(c);
+ return canSupportPublicClient(c) && c.getRedirectUris().isEmpty();
}
public void setCanSupportPublicClients(boolean support) {