fix: add organizationID query for user v2 ListUsers and clean up depeprecated attribute (#7593)

Add organizationID as query for ListUsers and clean up the deprecated Organisation attributes in other queries.

This PR removes the following fields from API requests (user service v2):

organisation from AddHumanUser (deprecated some time ago, organization still exists)
organization from GetUserByID

internal/api/grpc/server/middleware/auth_interceptor.go

@@ -44,30 +44,17 @@ func authorize(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo,
 
 func orgIDAndDomainFromRequest(ctx context.Context, req interface{}) (id, domain string) {
 	orgID := grpc_util.GetHeader(ctx, http.ZitadelOrgID)
-	o, ok := req.(OrganizationFromRequest)
-	if !ok {
-		return orgID, ""
-	}
-	id = o.OrganizationFromRequest().ID
-	domain = o.OrganizationFromRequest().Domain
-	if id != "" || domain != "" {
-		return id, domain
-	}
-	// check if the deprecated organisation is used.
-	// to be removed before going GA (https://github.com/zitadel/zitadel/issues/6718)
-	id = o.OrganisationFromRequest().ID
-	domain = o.OrganisationFromRequest().Domain
-	if id != "" || domain != "" {
-		return id, domain
+	oz, ok := req.(OrganizationFromRequest)
+	if ok {
+		id = oz.OrganizationFromRequest().ID
+		domain = oz.OrganizationFromRequest().Domain
+		if id != "" || domain != "" {
+			return id, domain
+		}
 	}
 	return orgID, domain
 }
 
-// Deprecated: will be removed in favor of OrganizationFromRequest (https://github.com/zitadel/zitadel/issues/6718)
-type OrganisationFromRequest interface {
-	OrganisationFromRequest() *Organization
-}
-
 type Organization struct {
 	ID     string
 	Domain string
@@ -75,5 +62,4 @@ type Organization struct {
 
 type OrganizationFromRequest interface {
 	OrganizationFromRequest() *Organization
-	OrganisationFromRequest
 }

internal/api/grpc/user/v2/query.go

@@ -239,8 +239,8 @@ func userQueryToQuery(query *user.SearchQuery, level uint8) (query.SearchQuery,
 		return typeQueryToQuery(q.TypeQuery)
 	case *user.SearchQuery_LoginNameQuery:
 		return loginNameQueryToQuery(q.LoginNameQuery)
-	case *user.SearchQuery_ResourceOwner:
-		return resourceOwnerQueryToQuery(q.ResourceOwner)
+	case *user.SearchQuery_OrganizationIdQuery:
+		return resourceOwnerQueryToQuery(q.OrganizationIdQuery)
 	case *user.SearchQuery_InUserIdsQuery:
 		return inUserIdsQueryToQuery(q.InUserIdsQuery)
 	case *user.SearchQuery_OrQuery:
@@ -292,8 +292,8 @@ func loginNameQueryToQuery(q *user.LoginNameQuery) (query.SearchQuery, error) {
 	return query.NewUserLoginNameExistsQuery(q.LoginName, object.TextMethodToQuery(q.Method))
 }
 
-func resourceOwnerQueryToQuery(q *user.ResourceOwnerQuery) (query.SearchQuery, error) {
-	return query.NewUserResourceOwnerSearchQuery(q.OrgID, query.TextEquals)
+func resourceOwnerQueryToQuery(q *user.OrganizationIdQuery) (query.SearchQuery, error) {
+	return query.NewUserResourceOwnerSearchQuery(q.OrganizationId, query.TextEquals)
 }
 
 func inUserIdsQueryToQuery(q *user.InUserIDQuery) (query.SearchQuery, error) {

internal/api/grpc/user/v2/query_integration_test.go

@@ -37,11 +37,6 @@ func TestServer_GetUserByID(t *testing.T) {
 			args: args{
 				IamCTX,
 				&user.GetUserByIDRequest{
-					Organization: &object.Organization{
-						Org: &object.Organization_OrgId{
-							OrgId: Tester.Organisation.ID,
-						},
-					},
 					UserId: "",
 				},
 				func(ctx context.Context, username string, request *user.GetUserByIDRequest) error {
@@ -55,11 +50,6 @@ func TestServer_GetUserByID(t *testing.T) {
 			args: args{
 				IamCTX,
 				&user.GetUserByIDRequest{
-					Organization: &object.Organization{
-						Org: &object.Organization_OrgId{
-							OrgId: Tester.Organisation.ID,
-						},
-					},
 					UserId: "unknown",
 				},
 				func(ctx context.Context, username string, request *user.GetUserByIDRequest) error {
@@ -72,13 +62,7 @@ func TestServer_GetUserByID(t *testing.T) {
 			name: "user by ID, ok",
 			args: args{
 				IamCTX,
-				&user.GetUserByIDRequest{
-					Organization: &object.Organization{
-						Org: &object.Organization_OrgId{
-							OrgId: Tester.Organisation.ID,
-						},
-					},
-				},
+				&user.GetUserByIDRequest{},
 				func(ctx context.Context, username string, request *user.GetUserByIDRequest) error {
 					resp := Tester.CreateHumanUserVerified(ctx, orgResp.OrganizationId, username)
 					request.UserId = resp.GetUserId()
@@ -172,11 +156,6 @@ func TestServer_GetUserByID_Permission(t *testing.T) {
 			args: args{
 				SystemCTX,
 				&user.GetUserByIDRequest{
-					Organization: &object.Organization{
-						Org: &object.Organization_OrgId{
-							OrgId: newOrg.GetOrganizationId(),
-						},
-					},
 					UserId: newUserID,
 				},
 			},
@@ -215,11 +194,6 @@ func TestServer_GetUserByID_Permission(t *testing.T) {
 			args: args{
 				IamCTX,
 				&user.GetUserByIDRequest{
-					Organization: &object.Organization{
-						Org: &object.Organization_OrgId{
-							OrgId: newOrg.GetOrganizationId(),
-						},
-					},
 					UserId: newUserID,
 				},
 			},
@@ -258,11 +232,6 @@ func TestServer_GetUserByID_Permission(t *testing.T) {
 			args: args{
 				CTX,
 				&user.GetUserByIDRequest{
-					Organization: &object.Organization{
-						Org: &object.Organization_OrgId{
-							OrgId: newOrg.GetOrganizationId(),
-						},
-					},
 					UserId: newUserID,
 				},
 			},
@@ -273,11 +242,6 @@ func TestServer_GetUserByID_Permission(t *testing.T) {
 			args: args{
 				UserCTX,
 				&user.GetUserByIDRequest{
-					Organization: &object.Organization{
-						Org: &object.Organization_OrgId{
-							OrgId: newOrg.GetOrganizationId(),
-						},
-					},
 					UserId: newUserID,
 				},
 			},
@@ -316,7 +280,7 @@ func TestServer_ListUsers(t *testing.T) {
 		ctx   context.Context
 		count int
 		req   *user.ListUsersRequest
-		dep   func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error)
+		dep   func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error)
 	}
 	tests := []struct {
 		name    string
@@ -330,7 +294,7 @@ func TestServer_ListUsers(t *testing.T) {
 				UserCTX,
 				0,
 				&user.ListUsersRequest{},
-				func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
 					request.Queries = append(request.Queries, InUserIDsQuery([]string{userResp.UserId}))
 					return []userAttr{}, nil
 				},
@@ -350,7 +314,7 @@ func TestServer_ListUsers(t *testing.T) {
 				IamCTX,
 				1,
 				&user.ListUsersRequest{},
-				func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
 					infos := make([]userAttr, len(usernames))
 					userIDs := make([]string, len(usernames))
 					for i, username := range usernames {
@@ -400,7 +364,7 @@ func TestServer_ListUsers(t *testing.T) {
 				IamCTX,
 				3,
 				&user.ListUsersRequest{},
-				func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
 					infos := make([]userAttr, len(usernames))
 					userIDs := make([]string, len(usernames))
 					for i, username := range usernames {
@@ -492,7 +456,7 @@ func TestServer_ListUsers(t *testing.T) {
 				IamCTX,
 				1,
 				&user.ListUsersRequest{},
-				func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
 					infos := make([]userAttr, len(usernames))
 					userIDs := make([]string, len(usernames))
 					for i, username := range usernames {
@@ -542,7 +506,7 @@ func TestServer_ListUsers(t *testing.T) {
 				IamCTX,
 				1,
 				&user.ListUsersRequest{},
-				func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
 					infos := make([]userAttr, len(usernames))
 					for i, username := range usernames {
 						resp := Tester.CreateHumanUserVerified(ctx, orgResp.OrganizationId, username)
@@ -590,7 +554,7 @@ func TestServer_ListUsers(t *testing.T) {
 				IamCTX,
 				3,
 				&user.ListUsersRequest{},
-				func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
 					infos := make([]userAttr, len(usernames))
 					for i, username := range usernames {
 						resp := Tester.CreateHumanUserVerified(ctx, orgResp.OrganizationId, username)
@@ -683,7 +647,7 @@ func TestServer_ListUsers(t *testing.T) {
 					InUserEmailsQuery([]string{"notfound"}),
 				},
 				},
-				func(ctx context.Context, org string, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
 					return []userAttr{}, nil
 				},
 			},
@@ -696,6 +660,99 @@ func TestServer_ListUsers(t *testing.T) {
 				Result:        []*user.User{},
 			},
 		},
+		{
+			name: "list user resourceowner multiple, ok",
+			args: args{
+				IamCTX,
+				3,
+				&user.ListUsersRequest{},
+				func(ctx context.Context, usernames []string, request *user.ListUsersRequest) ([]userAttr, error) {
+					orgResp := Tester.CreateOrganization(ctx, fmt.Sprintf("ListUsersResourceowner%d", time.Now().UnixNano()), fmt.Sprintf("%d@mouse.com", time.Now().UnixNano()))
+
+					infos := make([]userAttr, len(usernames))
+					for i, username := range usernames {
+						resp := Tester.CreateHumanUserVerified(ctx, orgResp.OrganizationId, username)
+						infos[i] = userAttr{resp.GetUserId(), username}
+					}
+					request.Queries = append(request.Queries, OrganizationIdQuery(orgResp.OrganizationId))
+					request.Queries = append(request.Queries, InUserEmailsQuery(usernames))
+					return infos, nil
+				},
+			},
+			want: &user.ListUsersResponse{
+				Details: &object.ListDetails{
+					TotalResult: 3,
+					Timestamp:   timestamppb.Now(),
+				},
+				SortingColumn: 0,
+				Result: []*user.User{
+					{
+						State: user.UserState_USER_STATE_ACTIVE,
+						Type: &user.User_Human{
+							Human: &user.HumanUser{
+								Profile: &user.HumanProfile{
+									GivenName:         "Mickey",
+									FamilyName:        "Mouse",
+									NickName:          gu.Ptr("Mickey"),
+									DisplayName:       gu.Ptr("Mickey Mouse"),
+									PreferredLanguage: gu.Ptr("nl"),
+									Gender:            user.Gender_GENDER_MALE.Enum(),
+								},
+								Email: &user.HumanEmail{
+									IsVerified: true,
+								},
+								Phone: &user.HumanPhone{
+									Phone:      "+41791234567",
+									IsVerified: true,
+								},
+							},
+						},
+					}, {
+						State: user.UserState_USER_STATE_ACTIVE,
+						Type: &user.User_Human{
+							Human: &user.HumanUser{
+								Profile: &user.HumanProfile{
+									GivenName:         "Mickey",
+									FamilyName:        "Mouse",
+									NickName:          gu.Ptr("Mickey"),
+									DisplayName:       gu.Ptr("Mickey Mouse"),
+									PreferredLanguage: gu.Ptr("nl"),
+									Gender:            user.Gender_GENDER_MALE.Enum(),
+								},
+								Email: &user.HumanEmail{
+									IsVerified: true,
+								},
+								Phone: &user.HumanPhone{
+									Phone:      "+41791234567",
+									IsVerified: true,
+								},
+							},
+						},
+					}, {
+						State: user.UserState_USER_STATE_ACTIVE,
+						Type: &user.User_Human{
+							Human: &user.HumanUser{
+								Profile: &user.HumanProfile{
+									GivenName:         "Mickey",
+									FamilyName:        "Mouse",
+									NickName:          gu.Ptr("Mickey"),
+									DisplayName:       gu.Ptr("Mickey Mouse"),
+									PreferredLanguage: gu.Ptr("nl"),
+									Gender:            user.Gender_GENDER_MALE.Enum(),
+								},
+								Email: &user.HumanEmail{
+									IsVerified: true,
+								},
+								Phone: &user.HumanPhone{
+									Phone:      "+41791234567",
+									IsVerified: true,
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -703,7 +760,7 @@ func TestServer_ListUsers(t *testing.T) {
 			for i := 0; i < tt.args.count; i++ {
 				usernames[i] = fmt.Sprintf("%d%d@mouse.com", time.Now().UnixNano(), i)
 			}
-			infos, err := tt.args.dep(tt.args.ctx, orgResp.OrganizationId, usernames, tt.args.req)
+			infos, err := tt.args.dep(tt.args.ctx, usernames, tt.args.req)
 			require.NoError(t, err)
 			retryDuration := time.Minute
 			if ctxDeadline, ok := CTX.Deadline(); ok {
@@ -768,3 +825,12 @@ func UsernameQuery(username string) *user.SearchQuery {
 	},
 	}
 }
+
+func OrganizationIdQuery(resourceowner string) *user.SearchQuery {
+	return &user.SearchQuery{Query: &user.SearchQuery_OrganizationIdQuery{
+		OrganizationIdQuery: &user.OrganizationIdQuery{
+			OrganizationId: resourceowner,
+		},
+	},
+	}
+}

internal/api/grpc/user/v2/user_integration_test.go

@@ -70,8 +70,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -111,8 +111,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -156,8 +156,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -202,8 +202,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -249,8 +249,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -290,8 +290,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -321,8 +321,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -355,8 +355,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -402,8 +402,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -454,8 +454,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -493,8 +493,8 @@ func TestServer_AddHumanUser(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: Tester.Organisation.ID,
 						},
 					},
@@ -572,8 +572,8 @@ func TestServer_AddHumanUser_Permission(t *testing.T) {
 			args: args{
 				SystemCTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: newOrg.GetOrganizationId(),
 						},
 					},
@@ -613,8 +613,8 @@ func TestServer_AddHumanUser_Permission(t *testing.T) {
 			args: args{
 				IamCTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: newOrg.GetOrganizationId(),
 						},
 					},
@@ -654,8 +654,8 @@ func TestServer_AddHumanUser_Permission(t *testing.T) {
 			args: args{
 				CTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: newOrg.GetOrganizationId(),
 						},
 					},
@@ -690,8 +690,8 @@ func TestServer_AddHumanUser_Permission(t *testing.T) {
 			args: args{
 				UserCTX,
 				&user.AddHumanUserRequest{
-					Organisation: &object.Organisation{
-						Org: &object.Organisation_OrgId{
+					Organization: &object.Organization{
+						Org: &object.Organization_OrgId{
 							OrgId: newOrg.GetOrganizationId(),
 						},
 					},