TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-06 19:36:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next-rc' into next

Browse Source 
# Conflicts:
#	go.mod
#	go.sum
#	internal/api/grpc/oidc/v2/integration_test/oidc_test.go
#	internal/api/grpc/oidc/v2beta/integration_test/oidc_test.go
#	internal/api/grpc/session/v2/session.go
#	internal/api/grpc/session/v2beta/session.go
#	internal/api/grpc/session/v2beta/session_test.go
#	internal/api/scim/integration_test/testdata/users_replace_test_minimal_with_email_type.json
#	internal/api/scim/integration_test/users_create_test.go
#	internal/api/scim/integration_test/users_get_test.go
#	internal/api/scim/integration_test/users_replace_test.go
#	internal/api/scim/integration_test/users_update_test.go
#	internal/queue/queue.go
This commit is contained in:
Stefan Benz
2025-07-31 17:34:29 +02:00
parent b76d8d37cb 615972aa2b
commit c86c60bab8
1174 changed files with 140674 additions and 36522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/api/grpc/admin/instance.go
View File

@@ -29,7 +29,8 @@ func (s *Server) ListInstanceDomains(ctx context.Context, req *admin_pb.ListInst
return nil, err
}
return &admin_pb.ListInstanceDomainsResponse{
Result: instance_grpc.DomainsToPb(domains.Domains),
Result: instance_grpc.DomainsToPb(domains.Domains),
SortingColumn: req.SortingColumn,
Details: object.ToListDetails(
domains.Count,
domains.Sequence,
@@ -48,7 +49,8 @@ func (s *Server) ListInstanceTrustedDomains(ctx context.Context, req *admin_pb.L
return nil, err
}
return &admin_pb.ListInstanceTrustedDomainsResponse{
Result: instance_grpc.TrustedDomainsToPb(domains.Domains),
Result: instance_grpc.TrustedDomainsToPb(domains.Domains),
SortingColumn: req.SortingColumn,
Details: object.ToListDetails(
domains.Count,
domains.Sequence,