TestDefaultOAuth2ClientDetailsEntityService done. Removed constructors from DefaultOAuth2ClientDetailsEntityService.
William Kim
Justin Richer
parent
701217d98c
commit
8851f4d037
|
|
@ -56,16 +56,7 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt
|
|||
@Autowired
|
||||
private BlacklistedSiteService blacklistedSiteService;
|
||||
|
||||
public DefaultOAuth2ClientDetailsEntityService() {
|
||||
|
||||
}
|
||||
|
||||
public DefaultOAuth2ClientDetailsEntityService(OAuth2ClientRepository clientRepository,
|
||||
OAuth2TokenRepository tokenRepository) {
|
||||
this.clientRepository = clientRepository;
|
||||
this.tokenRepository = tokenRepository;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ClientDetailsEntity saveNewClient(ClientDetailsEntity client) {
|
||||
if (client.getId() != null) { // if it's not null, it's already been saved, this is an error
|
||||
|
|
|
|||
|
|
@ -0,0 +1,282 @@
|
|||
/*******************************************************************************
|
||||
* Copyright 2013 The MITRE Corporation
|
||||
* and the MIT Kerberos and Internet Trust Consortium
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
******************************************************************************/
|
||||
package org.mitre.oauth2.service.impl;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
import static org.junit.matchers.JUnitMatchers.*;
|
||||
import static org.hamcrest.CoreMatchers.*;
|
||||
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mitre.oauth2.model.ClientDetailsEntity;
|
||||
import org.mitre.oauth2.repository.OAuth2ClientRepository;
|
||||
import org.mitre.oauth2.repository.OAuth2TokenRepository;
|
||||
import org.mitre.openid.connect.model.WhitelistedSite;
|
||||
import org.mitre.openid.connect.service.ApprovedSiteService;
|
||||
import org.mitre.openid.connect.service.BlacklistedSiteService;
|
||||
import org.mitre.openid.connect.service.WhitelistedSiteService;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.runners.MockitoJUnitRunner;
|
||||
import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
/**
|
||||
* @author wkim
|
||||
*
|
||||
*/
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class TestDefaultOAuth2ClientDetailsEntityService {
|
||||
|
||||
@Mock
|
||||
private OAuth2ClientRepository clientRepository;
|
||||
|
||||
@Mock
|
||||
private OAuth2TokenRepository tokenRepository;
|
||||
|
||||
@Mock
|
||||
private ApprovedSiteService approvedSiteService;
|
||||
|
||||
@Mock
|
||||
private WhitelistedSiteService whitelistedSiteService;
|
||||
|
||||
@Mock
|
||||
private BlacklistedSiteService blacklistedSiteService;
|
||||
|
||||
@InjectMocks
|
||||
private DefaultOAuth2ClientDetailsEntityService service;
|
||||
|
||||
@Before
|
||||
public void prepare() {
|
||||
Mockito.reset(clientRepository, tokenRepository, approvedSiteService, whitelistedSiteService, blacklistedSiteService);
|
||||
}
|
||||
|
||||
/**
|
||||
* Failure case of existing client id.
|
||||
*/
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void saveNewClient_badId() {
|
||||
|
||||
// Set up a mock client.
|
||||
ClientDetailsEntity client = Mockito.mock(ClientDetailsEntity.class);
|
||||
Mockito.when(client.getId()).thenReturn(12345L); // doesn't matter what id it returns
|
||||
|
||||
service.saveNewClient(client);
|
||||
}
|
||||
|
||||
/**
|
||||
* Failure case of blacklisted client uri.
|
||||
*/
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void saveNewClient_blacklisted() {
|
||||
|
||||
ClientDetailsEntity client = Mockito.mock(ClientDetailsEntity.class);
|
||||
Mockito.when(client.getId()).thenReturn(null);
|
||||
|
||||
String badUri = "badplace.xxx";
|
||||
|
||||
Mockito.when(blacklistedSiteService.isBlacklisted(badUri)).thenReturn(true);
|
||||
Mockito.when(client.getRegisteredRedirectUri()).thenReturn(Sets.newHashSet(badUri));
|
||||
|
||||
service.saveNewClient(client);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void saveNewClient_idWasAssigned() {
|
||||
|
||||
// Set up a mock client.
|
||||
ClientDetailsEntity client = Mockito.mock(ClientDetailsEntity.class);
|
||||
Mockito.when(client.getId()).thenReturn(null);
|
||||
|
||||
service.saveNewClient(client);
|
||||
|
||||
Mockito.verify(client).setClientId(Mockito.anyString());
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes sure client has offline access granted scope if allowed refresh tokens.
|
||||
*/
|
||||
@Test
|
||||
public void saveNewClient_yesOfflineAccess() {
|
||||
|
||||
ClientDetailsEntity client = Mockito.mock(ClientDetailsEntity.class);
|
||||
Mockito.when(client.getId()).thenReturn(null);
|
||||
|
||||
Mockito.when(client.isAllowRefresh()).thenReturn(true);
|
||||
Mockito.when(client.getScope()).thenReturn(Sets.newHashSet("offline_access"));
|
||||
|
||||
service.saveNewClient(client);
|
||||
|
||||
assertThat(client.getScope(), hasItem("offline_access"));
|
||||
}
|
||||
|
||||
/**
|
||||
* Makes sure client does not have offline access if not allowed to have refresh tokens.
|
||||
*/
|
||||
@Test
|
||||
public void saveNewClient_noOfflineAccess() {
|
||||
|
||||
ClientDetailsEntity client = Mockito.mock(ClientDetailsEntity.class);
|
||||
Mockito.when(client.getId()).thenReturn(null);
|
||||
|
||||
Mockito.when(client.isAllowRefresh()).thenReturn(false);
|
||||
Mockito.when(client.getScope()).thenReturn(Sets.newHashSet(""));
|
||||
|
||||
service.saveNewClient(client);
|
||||
|
||||
assertThat(client.getScope(), not(hasItem("offline_access")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void loadClientByClientId_badId() {
|
||||
|
||||
// null id
|
||||
try {
|
||||
service.loadClientByClientId(null);
|
||||
fail("Expected an IllegalArgumentException.");
|
||||
} catch (IllegalArgumentException e) {
|
||||
assertThat(e, is(notNullValue()));
|
||||
}
|
||||
|
||||
// empty id
|
||||
try {
|
||||
service.loadClientByClientId("");
|
||||
fail("Expected an IllegalArgumentException.");
|
||||
} catch (IllegalArgumentException e) {
|
||||
assertThat(e, is(notNullValue()));
|
||||
}
|
||||
|
||||
// id not found
|
||||
String clientId = "b00g3r";
|
||||
Mockito.when(clientRepository.getClientByClientId(clientId)).thenReturn(null);
|
||||
try {
|
||||
service.loadClientByClientId(clientId);
|
||||
fail("Expected an InvalidClientException.");
|
||||
} catch (InvalidClientException e) {
|
||||
assertThat(e, is(notNullValue()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Test(expected = InvalidClientException.class)
|
||||
public void deleteClient_badId() {
|
||||
|
||||
Long id = 12345L;
|
||||
ClientDetailsEntity client = Mockito.mock(ClientDetailsEntity.class);
|
||||
Mockito.when(client.getId()).thenReturn(id);
|
||||
Mockito.when(clientRepository.getById(id)).thenReturn(null);
|
||||
|
||||
service.deleteClient(client);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void deleteClient() {
|
||||
|
||||
Long id = 12345L;
|
||||
String clientId = "b00g3r";
|
||||
|
||||
ClientDetailsEntity client = Mockito.mock(ClientDetailsEntity.class);
|
||||
Mockito.when(client.getId()).thenReturn(id);
|
||||
Mockito.when(client.getClientId()).thenReturn(clientId);
|
||||
|
||||
Mockito.when(clientRepository.getById(id)).thenReturn(client);
|
||||
|
||||
WhitelistedSite site = Mockito.mock(WhitelistedSite.class);
|
||||
Mockito.when(whitelistedSiteService.getByClientId(clientId)).thenReturn(site);
|
||||
|
||||
service.deleteClient(client);
|
||||
|
||||
Mockito.verify(tokenRepository).clearTokensForClient(client);
|
||||
Mockito.verify(approvedSiteService).clearApprovedSitesForClient(client);
|
||||
Mockito.verify(whitelistedSiteService).remove(site);
|
||||
Mockito.verify(clientRepository).deleteClient(client);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateClient_nullClients() {
|
||||
|
||||
ClientDetailsEntity oldClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
ClientDetailsEntity newClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
|
||||
try {
|
||||
service.updateClient(oldClient, null);
|
||||
fail("New client is null. Expected an IllegalArgumentException.");
|
||||
} catch (IllegalArgumentException e) {
|
||||
assertThat(e, is(notNullValue()));
|
||||
}
|
||||
|
||||
try {
|
||||
service.updateClient(null, newClient);
|
||||
fail("Old client is null. Expected an IllegalArgumentException.");
|
||||
} catch (IllegalArgumentException e) {
|
||||
assertThat(e, is(notNullValue()));
|
||||
}
|
||||
|
||||
try {
|
||||
service.updateClient(null, null);
|
||||
fail("Both clients are null. Expected an IllegalArgumentException.");
|
||||
} catch (IllegalArgumentException e) {
|
||||
assertThat(e, is(notNullValue()));
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected = IllegalArgumentException.class)
|
||||
public void updateClient_blacklistedUri() {
|
||||
|
||||
ClientDetailsEntity oldClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
ClientDetailsEntity newClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
|
||||
String badSite = "badsite.xxx";
|
||||
|
||||
Mockito.when(newClient.getRegisteredRedirectUri()).thenReturn(Sets.newHashSet(badSite));
|
||||
Mockito.when(blacklistedSiteService.isBlacklisted(badSite)).thenReturn(true);
|
||||
|
||||
service.updateClient(oldClient, newClient);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateClient_yesOfflineAccess() {
|
||||
|
||||
ClientDetailsEntity oldClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
ClientDetailsEntity newClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
|
||||
Mockito.when(newClient.isAllowRefresh()).thenReturn(true);
|
||||
Mockito.when(newClient.getScope()).thenReturn(Sets.newHashSet("offline_access"));
|
||||
|
||||
service.updateClient(oldClient, newClient);
|
||||
|
||||
assertThat(newClient.getScope(), hasItem("offline_access"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateClient_noOfflineAccess() {
|
||||
|
||||
ClientDetailsEntity oldClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
ClientDetailsEntity newClient = Mockito.mock(ClientDetailsEntity.class);
|
||||
|
||||
Mockito.when(newClient.isAllowRefresh()).thenReturn(false);
|
||||
Mockito.when(newClient.getScope()).thenReturn(Sets.newHashSet(""));
|
||||
|
||||
service.updateClient(oldClient, newClient);
|
||||
|
||||
assertThat(newClient.getScope(), not(hasItem("offline_access")));
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue