Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/92b2da35 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/92b2da35 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/92b2da35 Branch: refs/heads/3.0.x-fixes Commit: 92b2da3594b7e83afd4b4b3a1b519c5686da2348 Parents: 60535fa Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Dec 4 17:12:28 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Dec 4 17:12:28 2015 +0000 ---------------------------------------------------------------------- .../services/AbstractImplicitGrantService.java | 19 ------------------- 1 file changed, 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/92b2da35/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java index 636768f..ad09e75 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java @@ -59,7 +59,6 @@ public abstract class AbstractImplicitGrantService extends RedirectionBasedGrant ServerAccessToken preAuthorizedToken) { ServerAccessToken token = null; if (preAuthorizedToken == null) { -<<<<<<< HEAD AccessTokenRegistration reg = new AccessTokenRegistration(); reg.setClient(client); reg.setGrantType(OAuthConstants.IMPLICIT_GRANT); @@ -70,24 +69,6 @@ public abstract class AbstractImplicitGrantService extends RedirectionBasedGrant reg.setApprovedScope(requestedScope); } else { reg.setApprovedScope(approvedScope); -======= - tokenCanBeReturned = canAccessTokenBeReturned(requestedScope, approvedScope); - if (tokenCanBeReturned) { - AccessTokenRegistration reg = new AccessTokenRegistration(); - reg.setClient(client); - reg.setGrantType(super.getSupportedGrantType()); - reg.setSubject(userSubject); - reg.setRequestedScope(requestedScope); - if (approvedScope == null || approvedScope.isEmpty()) { - // no down-scoping done by a user, all of the requested scopes have been authorized - reg.setApprovedScope(requestedScope); - } else { - reg.setApprovedScope(approvedScope); - } - reg.setAudience(state.getAudience()); - reg.setNonce(state.getNonce()); - token = getDataProvider().createAccessToken(reg); ->>>>>>> b7d3336... Add equals/hashCode methods for OAuthPermission so that the containsAll call in AbstractOAuthDataProvider.doRefreshAccessToken works } reg.setAudience(params.getFirst(OAuthConstants.CLIENT_AUDIENCE)); token = getDataProvider().createAccessToken(reg);
