From 61b828e182f104860e8e15f43134060f67aa6d7f Mon Sep 17 00:00:00 2001 From: Amanda Anganes Date: Tue, 4 Sep 2012 17:50:15 -0400 Subject: [PATCH] Fixed bug - removed service layer @Transactional annotations, which negated need for flush at repository level; moved @Transactional annotations. --- .../oauth2/repository/impl/JpaOAuth2TokenRepository.java | 1 - .../impl/DefaultOAuth2ClientDetailsEntityService.java | 1 - .../service/impl/DefaultOAuth2ProviderTokenService.java | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java index f46817fb5..049cdd092 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java @@ -31,7 +31,6 @@ import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; @Repository -@Transactional public class JpaOAuth2TokenRepository implements OAuth2TokenRepository { @PersistenceContext diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java index 359025502..1c3cbdfcc 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java @@ -40,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional; import com.google.common.base.Strings; @Service -@Transactional public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEntityService { private SecureRandom random = new SecureRandom(); diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java index 0cebd577b..877913be8 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java @@ -50,7 +50,6 @@ import org.springframework.transaction.annotation.Transactional; * */ @Service -@Transactional public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityService { private static Logger logger = LoggerFactory.getLogger(DefaultOAuth2ProviderTokenService.class); @@ -114,6 +113,7 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi //Add the authentication refreshToken.setAuthenticationHolder(authHolder); + refreshToken.setClient(client); // save the token first so that we can set it to a member of the access token (NOTE: is this step necessary?) tokenRepository.saveRefreshToken(refreshToken); @@ -214,7 +214,8 @@ public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityServi } if (accessToken.isExpired()) { - tokenRepository.removeAccessToken(accessToken); + //tokenRepository.removeAccessToken(accessToken); + revokeAccessToken(accessToken); throw new InvalidTokenException("Expired access token: " + accessTokenValue); }