You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/12/04 18:12:37 UTC
[1/5] cxf git commit: Add equals/hashCode methods for OAuthPermission
so that the containsAll call in
AbstractOAuthDataProvider.doRefreshAccessToken works
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 90789cc21 -> 92b2da359
Add equals/hashCode methods for OAuthPermission so that the containsAll call in AbstractOAuthDataProvider.doRefreshAccessToken works
Conflicts:
rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
Conflicts:
rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dae28f01
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dae28f01
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dae28f01
Branch: refs/heads/3.0.x-fixes
Commit: dae28f01e97a63e4915efad30036cce20ffda54f
Parents: 90789cc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 16:34:03 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 17:11:35 2015 +0000
----------------------------------------------------------------------
.../security/oauth2/common/OAuthPermission.java | 124 +++++++++++++++++++
.../services/AbstractImplicitGrantService.java | 19 +++
2 files changed, 143 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/dae28f01/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index 0aaf300..f23e2ad 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -77,4 +77,128 @@ public class OAuthPermission extends Permission {
return uris;
}
+<<<<<<< HEAD
+=======
+ /**
+ * Gets the permission description
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * Sets the permission description
+ * @param description
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * Get the permission value such as "read_calendar"
+ * @return the value
+ */
+ public String getPermission() {
+ return permission;
+ }
+
+ /**
+ * Sets the permission value such as "read_calendar"
+ * @param permission the permission value
+ */
+ public void setPermission(String permission) {
+ this.permission = permission;
+ }
+
+ /**
+ * Indicates if this permission has been allocated by default or not.
+ * Authorization View handlers may use this property to optimize the way the user selects the
+ * scopes.
+ * For example, assume that read', 'add' and 'update' scopes are supported and the
+ * 'read' scope is always allocated. This can be presented at the UI level as follows:
+ * the read-only check-box control will represent a 'read' scope and a user will be able to
+ * optionally select 'add' and/or 'update' scopes, in addition to the default 'read' one.
+ * @param isDefault true if the permission has been allocated by default
+ */
+ public void setDefault(boolean value) {
+ this.isDefault = value;
+ }
+
+ public boolean isDefault() {
+ return isDefault;
+ }
+
+ public boolean isInvisibleToClient() {
+ return invisibleToClient;
+ }
+
+ /**
+ * Set the visibility status; by default all the scopes approved by a user can
+ * be optionally reported to the client in access token responses. Some scopes may need
+ * to stay 'invisible' to client.
+ * @param invisibleToClient
+ */
+ public void setInvisibleToClient(boolean invisibleToClient) {
+ this.invisibleToClient = invisibleToClient;
+ }
+
+ @Override
+ public boolean equals(Object object) {
+ if (!(object instanceof OAuthPermission)) {
+ return false;
+ }
+
+ OAuthPermission that = (OAuthPermission)object;
+ if (this.httpVerbs != null && that.httpVerbs == null
+ || this.httpVerbs == null && that.httpVerbs != null
+ || this.httpVerbs != null && !this.httpVerbs.equals(that.httpVerbs)) {
+ return false;
+ }
+ if (this.uris != null && that.uris == null
+ || this.uris == null && that.uris != null
+ || this.uris != null && !this.uris.equals(that.uris)) {
+ return false;
+ }
+ if (this.permission != null && that.permission == null
+ || this.permission == null && that.permission != null
+ || this.permission != null && !this.permission.equals(that.permission)) {
+ return false;
+ }
+ if (this.description != null && that.description == null
+ || this.description == null && that.description != null
+ || this.description != null && !this.description.equals(that.description)) {
+ return false;
+ }
+ if (this.invisibleToClient != that.invisibleToClient) {
+ return false;
+ }
+ if (this.isDefault != that.isDefault) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hashCode = 17;
+ if (httpVerbs != null) {
+ hashCode = 31 * hashCode + httpVerbs.hashCode();
+ }
+ if (uris != null) {
+ hashCode = 31 * hashCode + uris.hashCode();
+ }
+ if (permission != null) {
+ hashCode = 31 * hashCode + permission.hashCode();
+ }
+ if (description != null) {
+ hashCode = 31 * hashCode + description.hashCode();
+ }
+ hashCode = 31 * hashCode + Boolean.hashCode(invisibleToClient);
+ hashCode = 31 * hashCode + Boolean.hashCode(isDefault);
+
+ return hashCode;
+ }
+>>>>>>> 8583a24... Add equals/hashCode methods for OAuthPermission so that the containsAll call in AbstractOAuthDataProvider.doRefreshAccessToken works
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/dae28f01/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 ad09e75..636768f 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,6 +59,7 @@ 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);
@@ -69,6 +70,24 @@ 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);
[3/5] cxf git commit: Fixing backmerge
Posted by co...@apache.org.
Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/db428972
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/db428972
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/db428972
Branch: refs/heads/3.0.x-fixes
Commit: db428972930f2c7721ae058d0dd69ff7de7656a9
Parents: 596a373
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 17:11:01 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 17:11:44 2015 +0000
----------------------------------------------------------------------
.../security/oauth2/common/OAuthPermission.java | 97 +-------------------
.../rs/security/oauth2/common/Permission.java | 39 ++++++++
2 files changed, 43 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/db428972/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index 88a2ad6..0421581 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -77,75 +77,9 @@ public class OAuthPermission extends Permission {
return uris;
}
-<<<<<<< HEAD
-=======
- /**
- * Gets the permission description
- * @return the description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the permission description
- * @param description
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
- /**
- * Get the permission value such as "read_calendar"
- * @return the value
- */
- public String getPermission() {
- return permission;
- }
-
- /**
- * Sets the permission value such as "read_calendar"
- * @param permission the permission value
- */
- public void setPermission(String permission) {
- this.permission = permission;
- }
-
- /**
- * Indicates if this permission has been allocated by default or not.
- * Authorization View handlers may use this property to optimize the way the user selects the
- * scopes.
- * For example, assume that read', 'add' and 'update' scopes are supported and the
- * 'read' scope is always allocated. This can be presented at the UI level as follows:
- * the read-only check-box control will represent a 'read' scope and a user will be able to
- * optionally select 'add' and/or 'update' scopes, in addition to the default 'read' one.
- * @param isDefault true if the permission has been allocated by default
- */
- public void setDefault(boolean value) {
- this.isDefault = value;
- }
-
- public boolean isDefault() {
- return isDefault;
- }
-
- public boolean isInvisibleToClient() {
- return invisibleToClient;
- }
-
- /**
- * Set the visibility status; by default all the scopes approved by a user can
- * be optionally reported to the client in access token responses. Some scopes may need
- * to stay 'invisible' to client.
- * @param invisibleToClient
- */
- public void setInvisibleToClient(boolean invisibleToClient) {
- this.invisibleToClient = invisibleToClient;
- }
-
@Override
public boolean equals(Object object) {
- if (!(object instanceof OAuthPermission)) {
+ if (!(object instanceof OAuthPermission) || !super.equals(object)) {
return false;
}
@@ -155,22 +89,8 @@ public class OAuthPermission extends Permission {
|| this.httpVerbs != null && !this.httpVerbs.equals(that.httpVerbs)) {
return false;
}
- if (this.uris != null && that.uris == null
- || this.uris == null && that.uris != null
- || this.uris != null && !this.uris.equals(that.uris)) {
- return false;
- }
- if (this.permission != null && that.permission == null
- || this.permission == null && that.permission != null
- || this.permission != null && !this.permission.equals(that.permission)) {
- return false;
- }
- if (this.description != null && that.description == null
- || this.description == null && that.description != null
- || this.description != null && !this.description.equals(that.description)) {
- return false;
- }
- if (this.invisibleToClient != that.invisibleToClient || this.isDefault != that.isDefault) { //NOPMD
+ if (this.uris != null && that.uris == null || this.uris == null && that.uris != null //NOPMD
+ || this.uris != null && !this.uris.equals(that.uris)) { //NOPMD
return false;
}
@@ -179,23 +99,14 @@ public class OAuthPermission extends Permission {
@Override
public int hashCode() {
- int hashCode = 17;
+ int hashCode = super.hashCode();
if (httpVerbs != null) {
hashCode = 31 * hashCode + httpVerbs.hashCode();
}
if (uris != null) {
hashCode = 31 * hashCode + uris.hashCode();
}
- if (permission != null) {
- hashCode = 31 * hashCode + permission.hashCode();
- }
- if (description != null) {
- hashCode = 31 * hashCode + description.hashCode();
- }
- hashCode = 31 * hashCode + Boolean.hashCode(invisibleToClient);
- hashCode = 31 * hashCode + Boolean.hashCode(isDefault);
return hashCode;
}
->>>>>>> 8583a24... Add equals/hashCode methods for OAuthPermission so that the containsAll call in AbstractOAuthDataProvider.doRefreshAccessToken works
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/db428972/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
index f6d4d29..6d293e5 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/Permission.java
@@ -103,4 +103,43 @@ public class Permission implements Serializable {
public void setInvisibleToClient(boolean invisibleToClient) {
this.invisibleToClient = invisibleToClient;
}
+
+ @Override
+ public boolean equals(Object object) {
+ if (!(object instanceof Permission)) {
+ return false;
+ }
+
+ Permission that = (Permission)object;
+ if (this.permission != null && that.permission == null
+ || this.permission == null && that.permission != null
+ || this.permission != null && !this.permission.equals(that.permission)) {
+ return false;
+ }
+ if (this.description != null && that.description == null
+ || this.description == null && that.description != null
+ || this.description != null && !this.description.equals(that.description)) {
+ return false;
+ }
+ if (this.invisibleToClient != that.invisibleToClient || this.isDefault != that.isDefault) { //NOPMD
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hashCode = 17;
+ if (permission != null) {
+ hashCode = 31 * hashCode + permission.hashCode();
+ }
+ if (description != null) {
+ hashCode = 31 * hashCode + description.hashCode();
+ }
+ hashCode = 31 * hashCode + Boolean.hashCode(invisibleToClient);
+ hashCode = 31 * hashCode + Boolean.hashCode(isDefault);
+
+ return hashCode;
+ }
}
[4/5] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/60535fab
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/60535fab
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/60535fab
Branch: refs/heads/3.0.x-fixes
Commit: 60535faba81c488179631428b4e9057691ab4482
Parents: db42897
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 17:11:44 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 17:11:44 2015 +0000
----------------------------------------------------------------------
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/60535fab/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9091f53..3c89646 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -165,6 +165,7 @@ B 4d49814ba85310599ee76e41742208383f3f6450
B 4da4d2300433e7e115f095becb1149b22ceb31ca
B 4e60f32c9c370b99d9574fa54d546badf647db53
B 4eec754b1bbd46e0142412cd37dbaf189c47f905
+B 4efd6b4c188c7e7c94feb6afc943df831da43180
B 4f61ca801deed173c648b2d424ac231663acd704
B 4f70bdf4199a666829cf9c6c62c508d12afbe251
B 4fe7844935f9b4ad797760613d143949f9448905
@@ -259,6 +260,7 @@ B 74a2e6f2b1d9787cc9b5cff4cc84e43cfccbfe94
B 74aea1227832d3000f2f9fe61d7cc3bcb8a60a79
B 75115ee15740b33c5cc09b1f4b79fc4a54e4611c
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
+B 770ea4c9b218ba34526fce5903feae6959c3366c
B 7737225402d3a7b2e669ee8ecf54de10af686f20
B 785955e8a26a891296908796abac0b1cf88c94ce
B 7923a6209a05d71cfeb752ed2d45c9e6e7116942
@@ -343,6 +345,7 @@ B 9de88cce894ca9ea746abf27943635467e23c153
B 9df377971980a0224f9a03f605c48f075d720446
B 9dfb278c7739b9f4621f43b8146d057e21fafb64
B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415
+B 9f20e99ffb13906a83c6a39bb16ceb3708c36f46
B 9fc26998d89a9f7d04d3a57a97b4c09c745b076b
B 9fce658c4611f790983a3d5cef7312eec8771461
B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9
@@ -761,6 +764,7 @@ M b3bf20abb23f186dbdb0e16519d5c02bbaf5a3ce
M b3c1804ba33e0c2c7d991b585ba8147eb13ee07b
M b4aa01a0de28462f7338d232e2e88be8512882af
M b5320827561467de7e04afdba15a6063d26493a3
+M b7d33366f3311dc33c7da389f98fced6fd470c93
M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
M bd1d31f195caab56fbe565fbfb63d9170a0c9406
[2/5] cxf git commit: PMD fix
Posted by co...@apache.org.
PMD fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/596a3739
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/596a3739
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/596a3739
Branch: refs/heads/3.0.x-fixes
Commit: 596a373908834c80a19e8d5c6c9a32966138186c
Parents: dae28f0
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 16:38:21 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 17:11:41 2015 +0000
----------------------------------------------------------------------
.../apache/cxf/rs/security/oauth2/common/OAuthPermission.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/596a3739/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index f23e2ad..88a2ad6 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -170,10 +170,7 @@ public class OAuthPermission extends Permission {
|| this.description != null && !this.description.equals(that.description)) {
return false;
}
- if (this.invisibleToClient != that.invisibleToClient) {
- return false;
- }
- if (this.isDefault != that.isDefault) {
+ if (this.invisibleToClient != that.invisibleToClient || this.isDefault != that.isDefault) { //NOPMD
return false;
}
[5/5] cxf git commit: Fixing merge
Posted by co...@apache.org.
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 <co...@apache.org>
Authored: Fri Dec 4 17:12:28 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
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);