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 0ba7b8967..f50a8bb8b 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 @@ -75,7 +75,10 @@ public class StaticAuthenticationProvider extends DaoAuthenticationProvider { password(securityProperties.getUser().getPassword()), createAuthorities( securityProperties.getUser().getRoles(), Collections.emptyList(), - PermissionUtils::createAllAuthorityList))); + () -> SpPermission.getAllAuthorities().stream() + .map(SimpleGrantedAuthority::new) + .map(GrantedAuthority.class::cast) + .toList()))); } return new FixedInMemoryTenantAwareUserDetailsService(userPrincipals); diff --git a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java index 69a95f2ff..32655526a 100644 --- a/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java +++ b/hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java @@ -30,18 +30,6 @@ import org.springframework.util.ReflectionUtils; @Story("Permission Test") public final class SpPermissionTest { - @Test - @Description("Verify the get permission function") - public void testGetPermissions() { - final int allPermission = 20; - final Collection allAuthorities = SpPermission.getAllAuthorities(); - final List allAuthoritiesList = PermissionUtils.createAllAuthorityList(); - assertThat(allAuthorities).hasSize(allPermission); - assertThat(allAuthoritiesList).hasSize(allPermission); - assertThat(allAuthoritiesList.stream().map(authority -> authority.getAuthority()).collect(Collectors.toList())) - .containsAll(allAuthorities); - } - @Test @Description("Try to double check if all permissions works as expected") void shouldReturnAllPermissions() { @@ -55,6 +43,8 @@ public final class SpPermissionTest { } } }); - assertThat(SpPermission.getAllAuthorities()).containsAll(expected); + final Collection allAuthorities = SpPermission.getAllAuthorities(); + assertThat(allAuthorities).hasSize(20); + assertThat(allAuthorities).containsAll(expected); } -} +} \ No newline at end of file