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 2016/04/21 16:26:43 UTC
cxf git commit: Minor update to JPAOAuthDataProvider
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes c0f105cfc -> e3b96547d
Minor update to JPAOAuthDataProvider
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e3b96547
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e3b96547
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e3b96547
Branch: refs/heads/3.1.x-fixes
Commit: e3b96547d7760ea1d9b9b64e3ea1cb10e8687cef
Parents: c0f105c
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Thu Apr 21 15:26:05 2016 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Thu Apr 21 15:26:05 2016 +0100
----------------------------------------------------------------------
.../security/oauth2/provider/JPAOAuthDataProvider.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e3b96547/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProvider.java
index c552592..bdce24b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProvider.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/JPAOAuthDataProvider.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
import org.apache.cxf.rs.security.oauth2.common.ServerAccessToken;
@@ -71,7 +72,7 @@ public class JPAOAuthDataProvider extends AbstractOAuthDataProvider {
@Override
public List<ServerAccessToken> getAccessTokens(Client c, UserSubject sub) {
- return getTokensQuery(c, sub).getResultList();
+ return CastUtils.cast(getTokensQuery(c, sub).getResultList());
}
@Override
@@ -144,23 +145,23 @@ public class JPAOAuthDataProvider extends AbstractOAuthDataProvider {
+ resourceOwnerSubject.getLogin() + "'", Client.class);
}
}
- protected TypedQuery<ServerAccessToken> getTokensQuery(Client c, UserSubject resourceOwnerSubject) {
+ protected TypedQuery<BearerAccessToken> getTokensQuery(Client c, UserSubject resourceOwnerSubject) {
if (c == null && resourceOwnerSubject == null) {
return entityManager.createQuery("SELECT t FROM " + BEARER_TOKEN_TABLE_NAME + " t",
- ServerAccessToken.class);
+ BearerAccessToken.class);
} else if (c == null) {
return entityManager.createQuery(
"SELECT t FROM " + BEARER_TOKEN_TABLE_NAME + " t JOIN t.subject s WHERE s.login = '"
- + resourceOwnerSubject.getLogin() + "'", ServerAccessToken.class);
+ + resourceOwnerSubject.getLogin() + "'", BearerAccessToken.class);
} else if (resourceOwnerSubject == null) {
return entityManager.createQuery(
"SELECT t FROM " + BEARER_TOKEN_TABLE_NAME + " t JOIN t.client c WHERE c.clientId = '"
- + c.getClientId() + "'", ServerAccessToken.class);
+ + c.getClientId() + "'", BearerAccessToken.class);
} else {
return entityManager.createQuery(
"SELECT t FROM " + BEARER_TOKEN_TABLE_NAME + " t JOIN t.subject s JOIN t.client c WHERE s.login = '"
+ resourceOwnerSubject.getLogin() + "' AND c.clientId = '" + c.getClientId() + "'",
- ServerAccessToken.class);
+ BearerAccessToken.class);
}
}
protected TypedQuery<RefreshToken> getRefreshTokensQuery(Client c, UserSubject resourceOwnerSubject) {