From 0d151108df9ebda45e4e6ec14dc4979ca2224d40 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@knecon.com>
Date: Mon, 26 Jun 2023 16:26:53 +0300
Subject: [PATCH] RED-6686 - fixed tenant name

---
 .../controller/internal/InternalTenantsController.java    | 2 +-
 .../service/TenantManagementService.java                  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java
index 0437777..fe595d2 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/controller/internal/InternalTenantsController.java
@@ -51,7 +51,7 @@ public class InternalTenantsController implements InternalTenantsResource {
     }
 
 
-    public TenantResponse getTenant(String tenantId) {
+    public TenantResponse getTenant(@PathVariable(TENANT_ID_PARAM) String tenantId) {
 
         return tenantManagementService.getTenant(tenantId);
     }
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 6ce032f..a7ca005 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
@@ -165,6 +165,7 @@ public class TenantManagementService implements TenantProvider {
         } catch (Exception e) {
             log.error("Tenant creation failed, rolling back", e);
             tenantRepository.deleteById(tenantRequest.getTenantId());
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,"Tenant creation failed", e);
         }
     }
 
@@ -216,7 +217,9 @@ public class TenantManagementService implements TenantProvider {
         realm.setAccessTokenLifespan(tenantUserManagementProperties.getTenantAccessTokenLifeSpan());
         realm.setSsoSessionIdleTimeout(tenantUserManagementProperties.getSsoSessionIdleTimeout());
 
-        realm.getAttributesOrEmpty().put(FRONTEND_URL_PROPERY, authServerUrl);
+        Map<String, String> attributes = new HashMap<>();
+        attributes.put(FRONTEND_URL_PROPERY, authServerUrl);
+        realm.setAttributes(attributes);
 
         var applicationClient = new ClientRepresentation();
         applicationClient.setEnabled(true);
@@ -288,8 +291,7 @@ public class TenantManagementService implements TenantProvider {
         user.setLastName(redUser.getLastName());
         user.setEmailVerified(true);
 
-        var roles = new ArrayList<String>();
-        roles.addAll(redUser.getRoles());
+        var roles = new ArrayList<String>(redUser.getRoles() != null ? redUser.getRoles() : new ArrayList<>());
         roles.add("uma_authorization");
         roles.add("offline_access");