Fix TenantAwareUserPropertes.User password (#1971)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>

hawkbit-runtime/hawkbit-mgmt-server/src/main/resources/application.properties

@@ -23,9 +23,9 @@ logging.level.server-security=INFO
 logging.pattern.console=%clr(%d{${logging.pattern.dateformat:yyyy-MM-dd'T'HH:mm:ss.SSSXXX}}){faint} %clr(${logging.pattern.level:%5p}) %clr(${PID:}){magenta} %clr(---){faint} %clr([${spring.application.name}] [%X{tenant}:%X{user}] [%15.15t]){faint} %clr(${logging.pattern.correlation:}){faint}%clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${logging.exception-conversion-word:%wEx}
 
 # Define DEFAULT tenant admin user admin/admin
+hawkbit.security.user.admin.tenant=DEFAULT
 hawkbit.security.user.admin.password={noop}admin
 hawkbit.security.user.admin.roles=TENANT_ADMIN
-hawkbit.security.user.admin.tenant=DEFAULT
 # allow to auto/implicit create DEFAULT tenant (on mgmt api call)
 hawkbit.server.repository.implicitTenantCreateAllowed=true
 

hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java

@@ -34,5 +34,4 @@ public abstract class AbstractSecurityTest {
                 .apply(SecurityMockMvcConfigurers.springSecurity()).dispatchOptions(true);
         mvc = builder.build();
     }
-
-}
+}

hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java

@@ -19,8 +19,10 @@ import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.TestPropertySource;
 
-@TestPropertySource(properties = { "hawkbit.server.security.allowedHostNames=localhost",
-        "hawkbit.server.security.httpFirewallIgnoredPaths=/index.html" })
+@TestPropertySource(properties = {
+        "hawkbit.server.security.allowedHostNames=localhost",
+        "hawkbit.server.security.httpFirewallIgnoredPaths=/index.html"
+})
 @Feature("Integration Test - Security")
 @Story("Allowed Host Names")
 public class AllowedHostNamesTest extends AbstractSecurityTest {

hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/TenantAwareUserProperties.java

@@ -33,11 +33,10 @@ public class TenantAwareUserProperties {
     @ToString
     public static class User {
 
+        private String tenant;
         @ToString.Exclude
         private String password;
         private List<String> roles = new ArrayList<>();
         private List<String> permissions = new ArrayList<>();
-        @NonNull
-        private String tenant;
     }
 }