Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ExtendedInMemoryUserDetailsManager.java #4304

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Update ExtendedInMemoryUserDetailsManager.java #4304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e4838d
Update ExtendedInMemoryUserDetailsManager.java
FlyingDutchmanLQY Apr 17, 2023
91675f7
add unit test to assert group list is correctly added
FlyingDutchmanLQY Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ain/java/org/activiti/core/common/spring/identity/ExtendedInMemoryUserDetailsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ public class ExtendedInMemoryUserDetailsManager extends InMemoryUserDetailsManag
public void createUser(UserDetails user) {
super.createUser(user);
users.add(user.getUsername());
groups = user.getAuthorities().stream()
groups.addAll(user.getAuthorities().stream()
.filter(x -> (x.getAuthority().contains("GROUP")))
.map(x -> (x.getAuthority()))
.collect(Collectors.toList());
.collect(Collectors.toList()));
}

public List<String> getUsers() {
Expand Down
9 changes: 9 additions & 0 deletions ...t/java/org/activiti/core/common/spring/identity/ExtendedInMemoryUserDetailsManagerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,13 @@ public void checkUsers() {
String adminUser = users.stream().filter(x -> x.equals("admin")).findFirst().get();
assertThat(adminUser).isNotNull();
}

@Test
public void getGroups(){
final List<String> groups = extendedInMemoryUserDetailsManager.getGroups();
assertThat(groups).isNotNull();
assertThat(groups.size() > 1).isTrue();
assertThat(groups.contains("GROUP_ACTIVITI_USER")).isTrue();
assertThat(groups.contains("GROUP_ACTIVITI_ADMIN")).isTrue();
}
}
2 changes: 2 additions & 0 deletions ...-identity/src/test/java/org/activiti/core/common/spring/identity/IdentityApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ public UserDetailsService myUserDetailsService() {

List<GrantedAuthority> userAuthorities = new ArrayList<>();
userAuthorities.add(new SimpleGrantedAuthority("ROLE_ACTIVITI_USER"));
userAuthorities.add(new SimpleGrantedAuthority("GROUP_ACTIVITI_USER"));

extendedInMemoryUserDetailsManager.createUser(new User("user", "password", userAuthorities));

List<GrantedAuthority> adminAuthorities = new ArrayList<>();
adminAuthorities.add(new SimpleGrantedAuthority("ROLE_ACTIVITI_ADMIN"));
adminAuthorities.add(new SimpleGrantedAuthority("GROUP_ACTIVITI_ADMIN"));

extendedInMemoryUserDetailsManager.createUser(new User("admin", "password", adminAuthorities));

Expand Down