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
No related branches found
No related tags found
No related merge requests found
......@@ -59,7 +59,6 @@ class KeycloakUserPreconditionService {
return Optional.of(String.format("User Email does not yet exist"));
}
return Optional.empty();
}
......@@ -85,6 +84,6 @@ class KeycloakUserPreconditionService {
}
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;
import de.ozgcloud.operator.keycloak.KeycloakClient;
import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService;
import io.fabric8.kubernetes.api.model.Secret;
class KeycloakUserPreconditionServiceTest {
......@@ -90,12 +89,12 @@ class KeycloakUserPreconditionServiceTest {
assertThat(response).isPresent();
}
@Test
void shouldReturnErrorIfUserEmailNotExists() {
var user = OzgCloudKeycloakUserTestFactory.create();
user.getSpec().getKeycloakUser().setEmail("");
doReturn(true).when(service).realmExists(REALM);
//doReturn(false).when(service).userEmailExists(user);
var response = service.getPreconditionErrors(user);
......@@ -127,6 +126,7 @@ class KeycloakUserPreconditionServiceTest {
assertThat(response).isEmpty();
}
@Test
void shouldCheckUserEmailExists() {
var user = OzgCloudKeycloakUserTestFactory.create();
......@@ -138,6 +138,7 @@ class KeycloakUserPreconditionServiceTest {
verify(service).userEmailExists(user);
}
@Test
void shouldCheckIfKeycloakClientExists() {
doReturn(true).when(keycloakGenericRemoteService).realmExists(anyString());
......@@ -191,14 +192,24 @@ class KeycloakUserPreconditionServiceTest {
assertThat(response).isTrue();
}
@Test
void shouldRespondUserEmailNotExists() {
void shouldRespondWhenUserEmailIsEmpty() {
var user = OzgCloudKeycloakUserTestFactory.create();
user.getSpec().getKeycloakUser().setEmail("");
var response = service.userEmailExists(user);
assertThat(response).isFalse();
}
@Test
void shouldRespondWhenUserEmailIsNull() {
var user = OzgCloudKeycloakUserTestFactory.create();
user.getSpec().getKeycloakUser().setEmail(null);
var response = service.userEmailExists(user);
assertThat(response).isFalse();
}
}
@Nested
......@@ -236,7 +247,8 @@ class KeycloakUserPreconditionServiceTest {
@Test
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);
......@@ -245,8 +257,10 @@ class KeycloakUserPreconditionServiceTest {
@Test
void shouldReturnGroupExists() {
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1,
OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2,
OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
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