lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove PermissionsUtil (#1964)

Browse Source 
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2024-11-08 11:31:09 +02:00
committed by GitHub
parent 2bb1611e1b
commit c69efe65b2
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/StaticAuthenticationProvider.java
View File

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

18
hawkbit-security-core/src/test/java/org/eclipse/hawkbit/im/authentication/SpPermissionTest.java
View File

@@ -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<String> allAuthorities = SpPermission.getAllAuthorities();
final List<GrantedAuthority> 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<String> allAuthorities = SpPermission.getAllAuthorities();
assertThat(allAuthorities).hasSize(20);
assertThat(allAuthorities).containsAll(expected);
}
}
}