From 0c9136d3702b24185ec1b8da3541979116d9ed7a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 9 Apr 2024 14:59:48 +0200
Subject: [PATCH] OZG-4870 add auth and from for smtpserver config
---
.../ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java | 2 ++
.../operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java | 2 ++
.../operator/keycloak/realm/KeycloakRealmMapperTest.java | 4 +++-
.../keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
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 e878cbe..e74f7d8 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
@@ -60,6 +60,8 @@ interface KeycloakRealmMapper {
smtpServer.put("user", server.getUser());
smtpServer.put("password", server.getPassword());
smtpServer.put("starttls", server.getStarttls().toString());
+ smtpServer.put("auth", server.getAuth().toString());
+ smtpServer.put("from", server.getFrom());
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 0d2ebab..d817517 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
@@ -65,6 +65,8 @@ static class KeycloakRealmSMTPServer {
private String port;
private Boolean starttls;
+ private Boolean auth;
+ private String from;
}
}
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 33cb8f8..c9fadd5 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
@@ -94,7 +94,7 @@ class KeycloakRealmMapperTest {
void shouldMapSmtpServer() {
var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
- assertThat(mapped.getSmtpServer().size()).isEqualTo(5);
+ assertThat(mapped.getSmtpServer().size()).isEqualTo(7);
}
@Test
@@ -106,6 +106,8 @@ class KeycloakRealmMapperTest {
assertThat(mappedSmtpServer.get("password")).isEqualTo("psw");
assertThat(mappedSmtpServer.get("user")).isEqualTo("user");
assertThat(mappedSmtpServer.get("starttls")).isEqualTo("true");
+ assertThat(mappedSmtpServer.get("auth")).isEqualTo("true");
+ assertThat(mappedSmtpServer.get("from")).isEqualTo("test@test.de");
}
}
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 5438178..12ba82a 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
@@ -29,7 +29,7 @@ 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 final static KeycloakRealmSMTPServer SMTP_SERVER = KeycloakRealmSMTPServer.builder().host("host").user("user").password("psw").port("432").starttls(true).auth(true).from("test@test.de").build();
public static OzgCloudKeycloakRealmSpec create() {
return createBuilder().build();
--
GitLab