diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java index 75bd712..7ae9912 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java @@ -91,6 +91,7 @@ public class TenantManagementService implements TenantProvider { // For now we update the master realm theme whenever we create the tenant updateMasterTheme(tenantUserManagementProperties.getLoginTheme()); + updateMasterDisplayName(tenantUserManagementProperties.getApplicationName()); log.info("Tenants are: {}", tenantRepository.findAll().stream().map(TenantEntity::getTenantId).toList()); log.info("Requested to create tenant for: {}", tenantRequest.getTenantId()); @@ -671,4 +672,12 @@ public class TenantManagementService implements TenantProvider { } + private void updateMasterDisplayName(String displayName) { + + log.info("Updating master realm display name: {}", displayName); + RealmRepresentation realmRepresentation = realmService.realm(MASTER_REALM).toRepresentation(); + realmRepresentation.setDisplayName(StringUtils.isEmpty(displayName) ? "Keycloak" : displayName); + realmService.realm(MASTER_REALM).update(realmRepresentation); + } + } diff --git a/src/main/resources/application-documine.yaml b/src/main/resources/application-documine.yaml index 715dd92..a548920 100644 --- a/src/main/resources/application-documine.yaml +++ b/src/main/resources/application-documine.yaml @@ -1,7 +1,7 @@ fforesight: tenant-user-management: application-client-id: 'redaction' - application-name: 'RedactManager' + application-name: 'Documine' client-id: 'manager' tenant-access-token-life-span: 300 realm: master diff --git a/src/test/java/com/knecon/fforesight/tests/RealmTest.java b/src/test/java/com/knecon/fforesight/tests/RealmTest.java new file mode 100644 index 0000000..4d35f80 --- /dev/null +++ b/src/test/java/com/knecon/fforesight/tests/RealmTest.java @@ -0,0 +1,25 @@ +package com.knecon.fforesight.tests; + +import static dasniko.testcontainers.keycloak.ExtendableKeycloakContainer.MASTER_REALM; +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; +import org.keycloak.representations.idm.RealmRepresentation; +import org.springframework.beans.factory.annotation.Autowired; + +import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest; +import com.knecon.fforesight.tenantusermanagement.service.RealmService; + +public class RealmTest extends AbstractTenantUserManagementIntegrationTest { + + @Autowired + private RealmService realmService; + + @Test + public void testInitialRealm() { + + RealmRepresentation realmRepresentation = realmService.realm(MASTER_REALM).toRepresentation(); + assertEquals(realmRepresentation.getDisplayName(), "tenant-user-management"); + assertEquals(realmRepresentation.getLoginTheme(), "redaction"); + } +}