github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added method to get client by its (new) Long id

pull/165/merge
Justin Richer 2012-08-10 16:28:56 -04:00
parent 480fb8e593
commit eb5a24690f
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-common/src/main/java/org/mitre/oauth2/repository/OAuth2ClientRepository.java
View File

@ -23,7 +23,7 @@ public interface OAuth2ClientRepository {
public ClientDetailsEntity getById(Long id); public ClientDetailsEntity getById(Long id);
public ClientDetailsEntity getClientById(String clientId); public ClientDetailsEntity getClientByClientId(String clientId);
public ClientDetailsEntity saveClient(ClientDetailsEntity client); public ClientDetailsEntity saveClient(ClientDetailsEntity client);

2
openid-connect-common/src/main/java/org/mitre/oauth2/service/ClientDetailsEntityService.java
View File

@ -25,6 +25,8 @@ import org.springframework.security.oauth2.provider.ClientDetailsService;
public interface ClientDetailsEntityService extends ClientDetailsService { public interface ClientDetailsEntityService extends ClientDetailsService {
public ClientDetailsEntity getClientById(Long id);
public ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception; public ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception;
public void deleteClient(ClientDetailsEntity client); public void deleteClient(ClientDetailsEntity client);

4
openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java
View File

@ -54,7 +54,7 @@ public class JpaOAuth2ClientRepository implements OAuth2ClientRepository {
* @see org.mitre.oauth2.repository.OAuth2ClientRepository#getClientById(java.lang.String) * @see org.mitre.oauth2.repository.OAuth2ClientRepository#getClientById(java.lang.String)
*/ */
@Override @Override
public ClientDetailsEntity getClientById(String clientId) { public ClientDetailsEntity getClientByClientId(String clientId) {
TypedQuery<ClientDetailsEntity> query = manager.createNamedQuery("ClientDetailsEntity.getByClientId", ClientDetailsEntity.class); TypedQuery<ClientDetailsEntity> query = manager.createNamedQuery("ClientDetailsEntity.getByClientId", ClientDetailsEntity.class);
query.setParameter("clientId", clientId); query.setParameter("clientId", clientId);
return JpaUtil.getSingleResult(query.getResultList()); return JpaUtil.getSingleResult(query.getResultList());
@ -73,7 +73,7 @@ public class JpaOAuth2ClientRepository implements OAuth2ClientRepository {
*/ */
@Override @Override
public void deleteClient(ClientDetailsEntity client) { public void deleteClient(ClientDetailsEntity client) {
ClientDetailsEntity found = getClientById(client.getClientId()); ClientDetailsEntity found = getClientByClientId(client.getClientId());
if (found != null) { if (found != null) {
manager.remove(found); manager.remove(found);
} else { } else {

15
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java
View File

@ -52,12 +52,21 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt
} }
/** /**
* Get the client for the given ID * Get the client by its internal ID
*/
public ClientDetailsEntity getClientById(Long id) {
ClientDetailsEntity client = clientRepository.getById(id);
return client;
}
/**
* Get the client for the given ClientID
*/ */
@Override @Override
public ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception, InvalidClientException, IllegalArgumentException { public ClientDetailsEntity loadClientByClientId(String clientId) throws OAuth2Exception, InvalidClientException, IllegalArgumentException {
if (!Strings.isNullOrEmpty(clientId)) { if (!Strings.isNullOrEmpty(clientId)) {
ClientDetailsEntity client = clientRepository.getClientById(clientId); ClientDetailsEntity client = clientRepository.getClientByClientId(clientId);
if (client == null) { if (client == null) {
throw new InvalidClientException("Client with id " + clientId + " was not found"); throw new InvalidClientException("Client with id " + clientId + " was not found");
} }
@ -75,7 +84,7 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt
@Override @Override
public void deleteClient(ClientDetailsEntity client) throws InvalidClientException { public void deleteClient(ClientDetailsEntity client) throws InvalidClientException {
if (clientRepository.getClientById(client.getClientId()) == null) { if (clientRepository.getClientByClientId(client.getClientId()) == null) {
throw new InvalidClientException("Client with id " + client.getClientId() + " was not found"); throw new InvalidClientException("Client with id " + client.getClientId() + " was not found");
} }