-
Notifications
You must be signed in to change notification settings - Fork 829
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor EmailAccountCreationService to use new UaaUrlUtils for URLs.
- Remove unused default redirect location. [#82406702] https://www.pivotaltracker.com/story/show/82406702 Signed-off-by: Chris Dutra <[email protected]>
- Loading branch information
1 parent
5a78284
commit 32fbc2d
Showing
3 changed files
with
50 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
| import org.cloudfoundry.identity.uaa.scim.ScimUser; | ||
| import org.cloudfoundry.identity.uaa.scim.ScimUserProvisioning; | ||
| import org.cloudfoundry.identity.uaa.scim.exception.ScimResourceAlreadyExistsException; | ||
| import org.cloudfoundry.identity.uaa.util.UaaUrlUtils; | ||
| import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder; | ||
| import org.cloudfoundry.identity.uaa.zone.MultitenancyFixture; | ||
| import org.codehaus.jackson.map.ObjectMapper; | ||
|
|
@@ -37,15 +38,13 @@ | |
| import org.mockito.ArgumentCaptor; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
| import org.springframework.beans.factory.annotation.Value; | ||
| import org.springframework.mock.web.MockHttpServletRequest; | ||
| import org.springframework.security.core.context.SecurityContextHolder; | ||
| import org.springframework.security.oauth2.provider.ClientDetails; | ||
| import org.springframework.security.oauth2.provider.ClientDetailsService; | ||
| import org.springframework.test.context.ContextConfiguration; | ||
| import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; | ||
| import org.springframework.web.client.HttpClientErrorException; | ||
| import org.springframework.web.client.RestTemplate; | ||
| import org.springframework.web.context.request.RequestContextHolder; | ||
| import org.springframework.web.context.request.ServletRequestAttributes; | ||
| import org.thymeleaf.spring4.SpringTemplateEngine; | ||
|
|
@@ -57,7 +56,6 @@ public class EmailAccountCreationServiceTests { | |
|
|
||
| private EmailAccountCreationService emailAccountCreationService; | ||
| private MessageService messageService; | ||
| private RestTemplate uaaTemplate; | ||
| private ExpiringCodeStore codeStore; | ||
| private ScimUserProvisioning scimUserProvisioning; | ||
| private ClientDetailsService clientDetailsService; | ||
|
|
@@ -72,7 +70,6 @@ public class EmailAccountCreationServiceTests { | |
| @Before | ||
| public void setUp() throws Exception { | ||
| SecurityContextHolder.clearContext(); | ||
| uaaTemplate = new RestTemplate(); | ||
| messageService = mock(MessageService.class); | ||
| codeStore = mock(ExpiringCodeStore.class); | ||
| scimUserProvisioning = mock(ScimUserProvisioning.class); | ||
|
|
@@ -85,9 +82,8 @@ public void setUp() throws Exception { | |
| codeStore, | ||
| scimUserProvisioning, | ||
| clientDetailsService, | ||
| "http://uaa.example.com", | ||
| "pivotal", | ||
| "http://login.example.com" | ||
| new UaaUrlUtils("http://uaa.example.com"), | ||
| "pivotal" | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -116,7 +112,7 @@ public void testBeginActivation() throws Exception { | |
| ); | ||
| String emailBody = emailBodyArgument.getValue(); | ||
| assertThat(emailBody, containsString("a Pivotal ID")); | ||
| assertThat(emailBody, containsString("<a href=\"http://login.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, containsString("<a href=\"http://uaa.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, not(containsString("Cloud Foundry"))); | ||
| } | ||
|
|
||
|
|
@@ -141,7 +137,7 @@ public void testBeginActivationInOtherZone() throws Exception { | |
| ); | ||
| String emailBody = emailBodyArgument.getValue(); | ||
| assertThat(emailBody, containsString("a Pivotal ID")); | ||
| assertThat(emailBody, containsString("<a href=\"http://test.login.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, containsString("<a href=\"http://test.uaa.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, not(containsString("Cloud Foundry"))); | ||
| } | ||
|
|
||
|
|
@@ -154,9 +150,8 @@ public void testBeginActivationWithOssBrand() throws Exception { | |
| codeStore, | ||
| scimUserProvisioning, | ||
| clientDetailsService, | ||
| "http://uaa.example.com", | ||
| "oss", | ||
| "http://login.example.com"); | ||
| new UaaUrlUtils("http://uaa.example.com"), | ||
| "oss"); | ||
|
|
||
| setUpForSuccess(); | ||
|
|
||
|
|
@@ -177,15 +172,15 @@ public void testBeginActivationWithOssBrand() throws Exception { | |
| ); | ||
| String emailBody = emailBodyArgument.getValue(); | ||
| assertThat(emailBody, containsString("an account")); | ||
| assertThat(emailBody, containsString("<a href=\"http://login.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, containsString("<a href=\"http://uaa.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, not(containsString("Pivotal"))); | ||
| } | ||
|
|
||
| @Test(expected = UaaException.class) | ||
| public void testBeginActivationWithExistingUser() throws Exception { | ||
| setUpForSuccess(); | ||
| user.setVerified(true); | ||
| when(scimUserProvisioning.query(anyString())).thenReturn(Arrays.asList(new ScimUser[] {user})); | ||
| when(scimUserProvisioning.query(anyString())).thenReturn(Arrays.asList(new ScimUser[]{user})); | ||
| when(scimUserProvisioning.createUser(any(ScimUser.class), anyString())).thenThrow(new ScimResourceAlreadyExistsException("duplicate")); | ||
| emailAccountCreationService.beginActivation("[email protected]", "password", "login"); | ||
| } | ||
|
|
@@ -195,7 +190,7 @@ public void testBeginActivationWithUnverifiedExistingUser() throws Exception { | |
| setUpForSuccess(); | ||
| user.setId("existing-user-id"); | ||
| user.setVerified(false); | ||
| when(scimUserProvisioning.query(anyString())).thenReturn(Arrays.asList(new ScimUser[] {user})); | ||
| when(scimUserProvisioning.query(anyString())).thenReturn(Arrays.asList(new ScimUser[]{user})); | ||
| when(scimUserProvisioning.createUser(any(ScimUser.class), anyString())).thenThrow(new ScimResourceAlreadyExistsException("duplicate")); | ||
| when(codeStore.generateCode(anyString(), any(Timestamp.class))).thenReturn(code); | ||
| when(codeStore.retrieveCode(anyString())).thenReturn(code); | ||
|
|
@@ -208,16 +203,38 @@ public void testBeginActivationWithUnverifiedExistingUser() throws Exception { | |
| emailAccountCreationService.beginActivation("[email protected]", "password", "login"); | ||
|
|
||
| verify(messageService).sendMessage( | ||
| eq("existing-user-id"), | ||
| eq("[email protected]"), | ||
| eq(MessageType.CREATE_ACCOUNT_CONFIRMATION), | ||
| anyString(), | ||
| anyString() | ||
| eq("existing-user-id"), | ||
| eq("[email protected]"), | ||
| eq(MessageType.CREATE_ACCOUNT_CONFIRMATION), | ||
| anyString(), | ||
| anyString() | ||
| ); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCompleteActivation() throws Exception { | ||
| setUpForSuccess(); | ||
| when(scimUserProvisioning.createUser(any(ScimUser.class), anyString())).thenReturn(user); | ||
| when(codeStore.generateCode(anyString(), any(Timestamp.class))).thenReturn(code); | ||
| when(codeStore.retrieveCode("the_secret_code")).thenReturn(code); | ||
| when(scimUserProvisioning.verifyUser(anyString(), anyInt())).thenReturn(user); | ||
| when(scimUserProvisioning.retrieve(anyString())).thenReturn(user); | ||
|
|
||
| ClientDetails client = mock(ClientDetails.class); | ||
| when(details.getClientId()).thenReturn("login"); | ||
| when(details.getAdditionalInformation()).thenReturn(new HashMap<String, Object>()); | ||
| when(clientDetailsService.loadClientByClientId(anyString())).thenReturn(client); | ||
|
|
||
| AccountCreationService.AccountCreationResponse accountCreation = emailAccountCreationService.completeActivation("the_secret_code"); | ||
|
|
||
| assertEquals("[email protected]", accountCreation.getUsername()); | ||
| assertEquals("newly-created-user-id", accountCreation.getUserId()); | ||
| assertEquals(null, accountCreation.getRedirectLocation()); | ||
| assertNotNull(accountCreation.getUserId()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testCompleteActivationWithClientRedirect() throws Exception { | ||
| setUpForSuccess(); | ||
| when(scimUserProvisioning.createUser(any(ScimUser.class), anyString())).thenReturn(user); | ||
| when(codeStore.generateCode(anyString(), any(Timestamp.class))).thenReturn(code); | ||
|
|
@@ -226,7 +243,6 @@ public void testCompleteActivation() throws Exception { | |
| when(scimUserProvisioning.retrieve(anyString())).thenReturn(user); | ||
| when(clientDetailsService.loadClientByClientId(anyString())).thenReturn(details); | ||
|
|
||
|
|
||
| AccountCreationService.AccountCreationResponse accountCreation = emailAccountCreationService.completeActivation("the_secret_code"); | ||
|
|
||
| assertEquals("[email protected]", accountCreation.getUsername()); | ||
|
|
@@ -268,7 +284,7 @@ public void testResendVerificationCode() throws Exception { | |
| ); | ||
| String emailBody = emailBodyArgument.getValue(); | ||
| assertThat(emailBody, containsString("a Pivotal ID")); | ||
| assertThat(emailBody, containsString("<a href=\"http://login.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, containsString("<a href=\"http://uaa.example.com/verify_user?code=the_secret_code&email=user%40example.com\">Activate your account</a>")); | ||
| assertThat(emailBody, not(containsString("Cloud Foundry"))); | ||
| } | ||
|
|
||
|
|
@@ -287,17 +303,12 @@ private void setUpForSuccess() throws Exception { | |
| Timestamp ts = new Timestamp(System.currentTimeMillis() + (60 * 60 * 1000)); // 1 hour | ||
| Map<String,Object> data = new HashMap<>(); | ||
| data.put("user_id","newly-created-user-id"); | ||
| data.put("client_id","login"); | ||
| data.put("client_id", "login"); | ||
| code = new ExpiringCode("the_secret_code", ts, new ObjectMapper().writeValueAsString(data)); | ||
|
|
||
| Map<String, Object> additionalInfo = new HashMap<>(); | ||
| additionalInfo.put(EmailAccountCreationService.SIGNUP_REDIRECT_URL, "http://example.com/redirect"); | ||
| when(details.getClientId()).thenReturn("login"); | ||
| when(details.getAdditionalInformation()).thenReturn(additionalInfo); | ||
|
|
||
| MockHttpServletRequest request = new MockHttpServletRequest(); | ||
| request.setProtocol("http"); | ||
| request.setContextPath("/login"); | ||
| RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request)); | ||
| } | ||
| } | ||