diff --git a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java index 79ea73218..d7b9246b4 100644 --- a/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java +++ b/openid-connect-client/src/main/java/org/mitre/openid/connect/client/keypublisher/ClientKeyPublisher.java @@ -67,7 +67,7 @@ public class ClientKeyPublisher implements BeanDefinitionRegistryPostProcessor { // view bean BeanDefinitionBuilder jwkView = BeanDefinitionBuilder.rootBeanDefinition(JWKSetView.class); registry.registerBeanDefinition(JWKSetView.VIEWNAME, jwkView.getBeanDefinition()); - viewResolver.addPropertyReference("jwk", "jwkKeyList"); + viewResolver.addPropertyReference("jwk", JWKSetView.VIEWNAME); } registry.registerBeanDefinition("clientKeyMapping", clientKeyMapping.getBeanDefinition()); diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java index 4a76339e0..8d93b3d81 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/AuthenticationHolderEntity.java @@ -34,7 +34,6 @@ import org.springframework.security.oauth2.provider.OAuth2Authentication; @Table(name = "authentication_holder") @NamedQueries ({ @NamedQuery(name = "AuthenticationHolderEntity.getAll", query = "select a from AuthenticationHolderEntity a"), - @NamedQuery(name = "AuthenticationHolderEntity.getByAuthentication", query = "select a from AuthenticationHolderEntity a where a.authentication = :authentication"), @NamedQuery(name = "AuthenticationHolderEntity.getUnusedAuthenticationHolders", query = "select a from AuthenticationHolderEntity a where a.id not in (select t.authenticationHolder.id from OAuth2AccessTokenEntity t) and a.id not in (select r.authenticationHolder.id from OAuth2RefreshTokenEntity r)") }) public class AuthenticationHolderEntity { diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java index 73848837d..d98395643 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/repository/AuthenticationHolderRepository.java @@ -26,10 +26,6 @@ public interface AuthenticationHolderRepository { public AuthenticationHolderEntity getById(Long id); - public AuthenticationHolderEntity getByAuthentication(OAuth2Authentication a); - - public void removeById(Long id); - public void remove(AuthenticationHolderEntity a); public AuthenticationHolderEntity save(AuthenticationHolderEntity a); diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java index 1d8a44901..c4d09c040 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/AddressRepository.java @@ -35,28 +35,4 @@ public interface AddressRepository { */ public Address getById(Long id); - /** - * Removes the given Address from the repository - * - * @param address - * the Address object to remove - */ - public void remove(Address address); - - /** - * Removes an Address from the repository - * - * @param id - * the id of the Address to remove - */ - public void removeById(Long id); - - /** - * Persists a Address - * - * @param address - * the Address to be saved - * @return - */ - public Address save(Address address); } diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java index 18a47aafd..dbfc75af0 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/repository/UserInfoRepository.java @@ -26,22 +26,6 @@ import org.mitre.openid.connect.model.UserInfo; */ public interface UserInfoRepository { - /** - * Persists a UserInfo object, if possible. - * - * @param user - * @return the persisted object - */ - public UserInfo save(UserInfo userInfo); - - /** - * Removes the given UserInfo from the repository, if possible. - * - * @param userInfo - * the UserInfo object to remove - */ - public void remove(UserInfo userInfo); - /** * Get a UserInfo object by its preferred_username field * @param username diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java index 5a358d6e6..43ddc628c 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/UserInfoService.java @@ -26,23 +26,6 @@ import org.mitre.openid.connect.model.UserInfo; */ public interface UserInfoService { - /** - * Save an UserInfo - * - * @param userInfo - * the UserInfo to be saved - */ - public void save(UserInfo userInfo); - - /** - * Remove the UserInfo - * - * @param userInfo - * the UserInfo to remove - */ - public void remove(UserInfo userInfo); - - /** * Get the UserInfo for the given username (usually maps to the * preferredUsername field). diff --git a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java index 632c2dec1..8c1156f41 100644 --- a/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java +++ b/openid-connect-common/src/main/java/org/mitre/openid/connect/service/WhitelistedSiteService.java @@ -52,13 +52,7 @@ public interface WhitelistedSiteService { */ public WhitelistedSite getByClientId(String clientId); - /** - * Return a collection of the WhitelistedSites created by a given user - * - * @param creator the user id of an admin who may have made some WhitelistedSites - * @return the collection of corresponding WhitelistedSites, if any, or null - */ - public Collection getByCreator(String creatorId); + /** * Removes the given WhitelistedSite from the repository diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java index ba7acdcf7..63a6a585d 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java @@ -49,24 +49,6 @@ public class JpaAuthenticationHolderRepository implements AuthenticationHolderRe return manager.find(AuthenticationHolderEntity.class, id); } - @Override - public AuthenticationHolderEntity getByAuthentication(OAuth2Authentication a) { - TypedQuery query = manager.createNamedQuery("AuthenticationHolderEntity.getByAuthentication", AuthenticationHolderEntity.class); - query.setParameter("authentication", a); - return JpaUtil.getSingleResult(query.getResultList()); - } - - @Override - @Transactional - public void removeById(Long id) { - AuthenticationHolderEntity found = getById(id); - if (found != null) { - manager.remove(found); - } else { - throw new IllegalArgumentException("AuthenticationHolderEntity not found: " + id); - } - } - @Override @Transactional public void remove(AuthenticationHolderEntity a) { diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java index dca51c212..813fed0a9 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java @@ -44,29 +44,4 @@ public class JpaAddressRepository implements AddressRepository { return manager.find(Address.class, id); } - @Override - @Transactional - public void remove(Address address) { - Address found = manager.find(Address.class, address.getId()); - - if (found != null) { - manager.remove(address); - } else { - throw new IllegalArgumentException(); - } - } - - @Override - @Transactional - public void removeById(Long id) { - Address found = getById(id); - - manager.remove(found); - } - - @Override - @Transactional - public Address save(Address address) { - return saveOrUpdate(address.getId(), manager, address); - } } diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java index fe2ee87c1..ca2c83a7b 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaUserInfoRepository.java @@ -41,26 +41,6 @@ public class JpaUserInfoRepository implements UserInfoRepository { @PersistenceContext private EntityManager manager; - @Override - @Transactional - public UserInfo save(UserInfo userInfo) { - DefaultUserInfo dui = (DefaultUserInfo)userInfo; - return saveOrUpdate(dui.getId(), manager, dui); - } - - @Override - @Transactional - public void remove(UserInfo userInfo) { - DefaultUserInfo dui = (DefaultUserInfo)userInfo; - UserInfo found = manager.find(DefaultUserInfo.class, dui.getId()); - - if (found != null) { - manager.remove(userInfo); - } else { - throw new IllegalArgumentException(); - } - } - /** * Get a single UserInfo object by its username */ diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java index ce9eb4f01..d5cfd3d53 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java @@ -44,16 +44,6 @@ public class DefaultUserInfoService implements UserInfoService { @Autowired private PairwiseIdentiferService pairwiseIdentifierService; - @Override - public void save(UserInfo userInfo) { - userInfoRepository.save(userInfo); - } - - @Override - public void remove(UserInfo userInfo) { - userInfoRepository.remove(userInfo); - } - @Override public UserInfo getByUsername(String username) { return userInfoRepository.getByUsername(username); diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java index 5f9f925c5..86c141c8f 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultWhitelistedSiteService.java @@ -66,11 +66,6 @@ public class DefaultWhitelistedSiteService implements WhitelistedSiteService { return repository.getByClientId(clientId); } - @Override - public Collection getByCreator(String creatorId) { - return repository.getByCreator(creatorId); - } - @Override public WhitelistedSite update(WhitelistedSite oldWhitelistedSite, WhitelistedSite whitelistedSite) { if (oldWhitelistedSite == null || whitelistedSite == null) {