diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java index 51e74c989c1a5b25c883019b39e71b4444e8d6cb..e878cbef51228cb42ffd8b28d2438fccd0707a6c 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java @@ -59,7 +59,7 @@ interface KeycloakRealmMapper { smtpServer.put("port", server.getPort()); smtpServer.put("user", server.getUser()); smtpServer.put("password", server.getPassword()); - smtpServer.put("starttls", server.getStarttls()); + smtpServer.put("starttls", server.getStarttls().toString()); return smtpServer; } diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java index 750563d44e0b93cf95f4ec892c51acf1cccf0a72..0d2ebabd77dc9fe45f9bf4bff1ca1bb0aaf46428 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java @@ -64,7 +64,7 @@ static class KeycloakRealmSMTPServer { private String port; - private String starttls; + private Boolean starttls; } } diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java index ddb2e9ab9fb47e512906eb0d9ffd96ae5e9cde75..33cb8f851b887dc612bf2bbb829bab31a0e1f849 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java @@ -89,4 +89,23 @@ class KeycloakRealmMapperTest { assertThat(mapped.getActionTokenGeneratedByUserLifespan()).isEqualTo(900); } + + @Test + void shouldMapSmtpServer() { + var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create()); + + assertThat(mapped.getSmtpServer().size()).isEqualTo(5); + } + + @Test + void shouldContainSmtpServerKeysValues() { + var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create()); + var mappedSmtpServer = mapped.getSmtpServer(); + assertThat(mappedSmtpServer.get("host")).isEqualTo("host"); + assertThat(mappedSmtpServer.get("port")).isEqualTo("432"); + assertThat(mappedSmtpServer.get("password")).isEqualTo("psw"); + assertThat(mappedSmtpServer.get("user")).isEqualTo("user"); + assertThat(mappedSmtpServer.get("starttls")).isEqualTo("true"); + + } } diff --git a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java index fe23573b6987541b5246e82bf9a6c8ceb9267fe4..5438178209d5bd557943829bdce19aacd3f83687 100644 --- a/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java +++ b/ozgcloud-keycloak-operator/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java @@ -23,10 +23,13 @@ */ package de.ozgcloud.operator.keycloak.realm; +import de.ozgcloud.operator.keycloak.realm.OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer; + public class OzgCloudKeycloakRealmSpecTestFactory { public final static String DISPLAY_NAME = "TestDisplayName"; public final static boolean KEEP_AFTER_DELETE = false; + public final static KeycloakRealmSMTPServer SMTP_SERVER = KeycloakRealmSMTPServer.builder().host("host").user("user").password("psw").port("432").starttls(true).build(); public static OzgCloudKeycloakRealmSpec create() { return createBuilder().build(); @@ -35,6 +38,7 @@ public class OzgCloudKeycloakRealmSpecTestFactory { public static OzgCloudKeycloakRealmSpec.OzgCloudKeycloakRealmSpecBuilder createBuilder() { return OzgCloudKeycloakRealmSpec.builder() .keepAfterDelete(KEEP_AFTER_DELETE) - .displayName(DISPLAY_NAME); + .displayName(DISPLAY_NAME) + .smtpServer(SMTP_SERVER); } }