Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/client/keycloak/adapter/gocloak_adapter_groups.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ func getGroupByName(groups []gocloak.Group, groupName string) *gocloak.Group {
}

if g.SubGroups != nil {
return getGroupByName(*g.SubGroups, groupName)
if group := getGroupByName(*g.SubGroups, groupName); group != nil {
return group
}
}
}

Expand Down
14 changes: 12 additions & 2 deletions pkg/client/keycloak/adapter/gocloak_adapter_groups_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,20 @@ func TestGetGroupByName(t *testing.T) {
name: "find group by name",
groups: []gocloak.Group{
{Name: gocloak.StringP("group1")},
{Name: gocloak.StringP("group2")},
{
Name: gocloak.StringP("group2"),
SubGroups: &[]gocloak.Group{
{Name: gocloak.StringP("child1")},
},
},
},
groupName: "group2",
want: &gocloak.Group{Name: gocloak.StringP("group2")},
want: &gocloak.Group{
Name: gocloak.StringP("group2"),
SubGroups: &[]gocloak.Group{
{Name: gocloak.StringP("child1")},
},
},
},
{
name: "find group in subgroups",
Expand Down