cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1518252 - in /cxf/branches/2.7.x-fixes: ./ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/
Date Wed, 28 Aug 2013 15:10:15 GMT
Author: sergeyb
Date: Wed Aug 28 15:10:14 2013
New Revision: 1518252

URL: http://svn.apache.org/r1518252
Log:
Merged revisions 1518208 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1518208 | sergeyb | 2013-08-28 15:00:14 +0100 (Wed, 28 Aug 2013) | 1 line
  
  Support public clients having redirect URIs
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
    cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1518208

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java?rev=1518252&r1=1518251&r2=1518252&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AccessTokenService.java
Wed Aug 28 15:10:14 2013
@@ -197,7 +197,6 @@ public class AccessTokenService extends 
         if (canSupportPublicClients 
             && !client.isConfidential() 
             && client.getClientSecret() == null 
-            && client.getRedirectUris().isEmpty()
             && clientSecret == null) {
             return client;
         }

Modified: cxf/branches/2.7.x-fixes/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/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java?rev=1518252&r1=1518251&r2=1518252&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
Wed Aug 28 15:10: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) {



Mime
View raw message