fix: add default organization as query for org v2 list (#8719)

# Which Problems Are Solved

To get the default organization we have no direct solution.

# How the Problems Are Solved

Add default organization as query to the org v2 List.

# Additional Changes

None

# Additional Context

Closes #8616

---------

Co-authored-by: Livio Spring <livio.a@gmail.com>
This commit is contained in:
Stefan Benz
2024-10-07 11:28:39 +02:00
committed by GitHub
parent f653589609
commit d03ad62edd
4 changed files with 55 additions and 7 deletions

View File

@@ -42,6 +42,8 @@ func TestMain(m *testing.M) {
}
func TestServer_AddOrganization(t *testing.T) {
t.Parallel()
idpResp := Instance.AddGenericOAuthProvider(CTX, Instance.DefaultOrg.Id)
tests := []struct {

View File

@@ -26,6 +26,8 @@ type orgAttr struct {
}
func TestServer_ListOrganizations(t *testing.T) {
t.Parallel()
type args struct {
ctx context.Context
req *org.ListOrganizationsRequest
@@ -37,6 +39,38 @@ func TestServer_ListOrganizations(t *testing.T) {
want *org.ListOrganizationsResponse
wantErr bool
}{
{
name: "list org by default, ok",
args: args{
CTX,
&org.ListOrganizationsRequest{
Queries: []*org.SearchQuery{
DefaultOrganizationQuery(),
},
},
nil,
},
want: &org.ListOrganizationsResponse{
Details: &object.ListDetails{
TotalResult: 1,
Timestamp: timestamppb.Now(),
},
SortingColumn: 0,
Result: []*org.Organization{
{
Id: Instance.DefaultOrg.Id,
Name: Instance.DefaultOrg.Name,
PrimaryDomain: Instance.DefaultOrg.PrimaryDomain,
State: org.OrganizationState_ORGANIZATION_STATE_ACTIVE,
Details: &object.Details{
Sequence: Instance.DefaultOrg.Details.Sequence,
ChangeDate: Instance.DefaultOrg.Details.ChangeDate,
ResourceOwner: Instance.DefaultOrg.Details.ResourceOwner,
},
},
},
},
},
{
name: "list org by id, ok, multiple",
args: args{
@@ -401,6 +435,12 @@ func TestServer_ListOrganizations(t *testing.T) {
}
}
func DefaultOrganizationQuery() *org.SearchQuery {
return &org.SearchQuery{Query: &org.SearchQuery_DefaultQuery{
DefaultQuery: &org.DefaultOrganizationQuery{},
}}
}
func OrganizationIdQuery(resourceowner string) *org.SearchQuery {
return &org.SearchQuery{Query: &org.SearchQuery_IdQuery{
IdQuery: &org.OrganizationIDQuery{