Marmelator/tenant-user-management-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 202 Wiki Activity

Merge branch 'RED-7794' into 'main'

Browse Source 
RED-7794 - Fix error page not showing correct name

See merge request fforesight/tenant-user-management-service!46
This commit is contained in:
Kilian Schüttler 2023-11-24 10:36:06 +01:00
commit b97bd1d9df
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
View File

@ -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);
}
}

2
src/main/resources/application-documine.yaml
View File

@ -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

25
src/test/java/com/knecon/fforesight/tests/RealmTest.java Normal file
View File

@ -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");
}
}