Skip to content
Snippets Groups Projects
Commit 7f6de450 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-6500 kc user precondition check user email

parent 89dbbb92
Branches
Tags
No related merge requests found
...@@ -59,7 +59,6 @@ class KeycloakUserPreconditionService { ...@@ -59,7 +59,6 @@ class KeycloakUserPreconditionService {
return Optional.of(String.format("User Email does not yet exist")); return Optional.of(String.format("User Email does not yet exist"));
} }
return Optional.empty(); return Optional.empty();
} }
...@@ -85,6 +84,6 @@ class KeycloakUserPreconditionService { ...@@ -85,6 +84,6 @@ class KeycloakUserPreconditionService {
} }
boolean userEmailExists(OzgCloudKeycloakUser user) { boolean userEmailExists(OzgCloudKeycloakUser user) {
return !user.getSpec().getKeycloakUser().getEmail().isEmpty(); return !Optional.ofNullable(user.getSpec().getKeycloakUser().getEmail()).orElse("").isEmpty();
} }
} }
...@@ -41,7 +41,6 @@ import org.mockito.Spy; ...@@ -41,7 +41,6 @@ import org.mockito.Spy;
import de.ozgcloud.operator.keycloak.KeycloakClient; import de.ozgcloud.operator.keycloak.KeycloakClient;
import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService; import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService;
import io.fabric8.kubernetes.api.model.Secret;
class KeycloakUserPreconditionServiceTest { class KeycloakUserPreconditionServiceTest {
...@@ -90,12 +89,12 @@ class KeycloakUserPreconditionServiceTest { ...@@ -90,12 +89,12 @@ class KeycloakUserPreconditionServiceTest {
assertThat(response).isPresent(); assertThat(response).isPresent();
} }
@Test @Test
void shouldReturnErrorIfUserEmailNotExists() { void shouldReturnErrorIfUserEmailNotExists() {
var user = OzgCloudKeycloakUserTestFactory.create(); var user = OzgCloudKeycloakUserTestFactory.create();
user.getSpec().getKeycloakUser().setEmail("");
doReturn(true).when(service).realmExists(REALM); doReturn(true).when(service).realmExists(REALM);
//doReturn(false).when(service).userEmailExists(user);
var response = service.getPreconditionErrors(user); var response = service.getPreconditionErrors(user);
...@@ -127,6 +126,7 @@ class KeycloakUserPreconditionServiceTest { ...@@ -127,6 +126,7 @@ class KeycloakUserPreconditionServiceTest {
assertThat(response).isEmpty(); assertThat(response).isEmpty();
} }
@Test @Test
void shouldCheckUserEmailExists() { void shouldCheckUserEmailExists() {
var user = OzgCloudKeycloakUserTestFactory.create(); var user = OzgCloudKeycloakUserTestFactory.create();
...@@ -138,6 +138,7 @@ class KeycloakUserPreconditionServiceTest { ...@@ -138,6 +138,7 @@ class KeycloakUserPreconditionServiceTest {
verify(service).userEmailExists(user); verify(service).userEmailExists(user);
} }
@Test @Test
void shouldCheckIfKeycloakClientExists() { void shouldCheckIfKeycloakClientExists() {
doReturn(true).when(keycloakGenericRemoteService).realmExists(anyString()); doReturn(true).when(keycloakGenericRemoteService).realmExists(anyString());
...@@ -191,14 +192,24 @@ class KeycloakUserPreconditionServiceTest { ...@@ -191,14 +192,24 @@ class KeycloakUserPreconditionServiceTest {
assertThat(response).isTrue(); assertThat(response).isTrue();
} }
@Test @Test
void shouldRespondUserEmailNotExists() { void shouldRespondWhenUserEmailIsEmpty() {
var user = OzgCloudKeycloakUserTestFactory.create(); var user = OzgCloudKeycloakUserTestFactory.create();
user.getSpec().getKeycloakUser().setEmail(""); user.getSpec().getKeycloakUser().setEmail("");
var response = service.userEmailExists(user); var response = service.userEmailExists(user);
assertThat(response).isFalse(); assertThat(response).isFalse();
} }
@Test
void shouldRespondWhenUserEmailIsNull() {
var user = OzgCloudKeycloakUserTestFactory.create();
user.getSpec().getKeycloakUser().setEmail(null);
var response = service.userEmailExists(user);
assertThat(response).isFalse();
}
} }
@Nested @Nested
...@@ -236,7 +247,8 @@ class KeycloakUserPreconditionServiceTest { ...@@ -236,7 +247,8 @@ class KeycloakUserPreconditionServiceTest {
@Test @Test
void shouldReturnMissingGroup() { void shouldReturnMissingGroup() {
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(false); when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1,
OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(false);
var rsp = service.getPreconditionErrors(user); var rsp = service.getPreconditionErrors(user);
...@@ -245,8 +257,10 @@ class KeycloakUserPreconditionServiceTest { ...@@ -245,8 +257,10 @@ class KeycloakUserPreconditionServiceTest {
@Test @Test
void shouldReturnGroupExists() { void shouldReturnGroupExists() {
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true); when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1,
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true); OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2,
OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
var rsp = service.getPreconditionErrors(user); var rsp = service.getPreconditionErrors(user);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment