From f45d8f0180c565e610d0b95042ad0d8344f8d47b Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Thu, 29 Feb 2024 16:03:11 +0200
Subject: [PATCH] Fix TenantAwareUserProperies (#1672)

Fixed in order to get properties of form hawkbit.security.user.<username>.<property>

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 .../autoconfigure/security/SecurityAutoConfiguration.java     | 2 +-
 .../im/authentication/StaticAuthenticationProvider.java       | 2 +-
 .../hawkbit/im/authentication/TenantAwareUserProperties.java  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
index 87677e76d..d14660ed2 100644
--- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
+++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
@@ -82,7 +82,7 @@ public class SecurityAutoConfiguration {
     @ConditionalOnMissingBean
     public UserAuthoritiesResolver inMemoryAuthoritiesResolver(final SecurityProperties securityProperties,
             final TenantAwareUserProperties tenantAwareUserProperties) {
-        final Map<String, User> tenantAwareUsers = tenantAwareUserProperties.getUsers();
+        final Map<String, User> tenantAwareUsers = tenantAwareUserProperties.getUser();
         final Map<String, List<String>> usersToPermissions;
         if (!CollectionUtils.isEmpty(tenantAwareUsers)) {
             usersToPermissions = tenantAwareUsers.entrySet().stream().collect(
diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java
index a2d19dcae..9eea73b1f 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java
@@ -59,7 +59,7 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider {
             final TenantAwareUserProperties tenantAwareUserProperties,
             final PasswordEncoder passwordEncoder) {
         final List<User> userPrincipals = new ArrayList<>();
-        tenantAwareUserProperties.getUsers().forEach((username, user) -> {
+        tenantAwareUserProperties.getUser().forEach((username, user) -> {
             final String password = password(user.getPassword(), passwordEncoder);
             final List<GrantedAuthority> credentials =
                     createAuthorities(user.getRoles(), user.getPermissions(), Collections::emptyList);
diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/TenantAwareUserProperties.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/TenantAwareUserProperties.java
index ec03946ae..3d8b2bb3e 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/TenantAwareUserProperties.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/TenantAwareUserProperties.java
@@ -23,10 +23,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  */
 @Data
 @ToString
-@ConfigurationProperties("hawkbit.security.user")
+@ConfigurationProperties("hawkbit.security")
 public class TenantAwareUserProperties {
 
-    private Map<String, User> users = new HashMap<>();
+    private Map<String, User> user = new HashMap<>();
 
     @Data
     @ToString