2025-06-04 09:17:23 +02:00
|
|
|
package user
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
|
feat: exchange gRPC server implementation to connectRPC (#10145)
# Which Problems Are Solved
The current maintained gRPC server in combination with a REST (grpc)
gateway is getting harder and harder to maintain. Additionally, there
have been and still are issues with supporting / displaying `oneOf`s
correctly.
We therefore decided to exchange the server implementation to
connectRPC, which apart from supporting connect as protocol, also also
"standard" gRCP clients as well as HTTP/1.1 / rest like clients, e.g.
curl directly call the server without any additional gateway.
# How the Problems Are Solved
- All v2 services are moved to connectRPC implementation. (v1 services
are still served as pure grpc servers)
- All gRPC server interceptors were migrated / copied to a corresponding
connectRPC interceptor.
- API.ListGrpcServices and API. ListGrpcMethods were changed to include
the connect services and endpoints.
- gRPC server reflection was changed to a `StaticReflector` using the
`ListGrpcServices` list.
- The `grpc.Server` interfaces was split into different combinations to
be able to handle the different cases (grpc server and prefixed gateway,
connect server with grpc gateway, connect server only, ...)
- Docs of services serving connectRPC only with no additional gateway
(instance, webkey, project, app, org v2 beta) are changed to expose that
- since the plugin is not yet available on buf, we download it using
`postinstall` hook of the docs
# Additional Changes
- WebKey service is added as v2 service (in addition to the current
v2beta)
# Additional Context
closes #9483
---------
Co-authored-by: Elio Bischof <elio@zitadel.com>
2025-07-04 10:06:20 -04:00
|
|
|
"connectrpc.com/connect"
|
2025-06-04 09:17:23 +02:00
|
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
|
|
|
|
"github.com/zitadel/zitadel/internal/api/grpc/filter/v2"
|
|
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
|
|
filter_pb "github.com/zitadel/zitadel/pkg/grpc/filter/v2"
|
|
|
|
"github.com/zitadel/zitadel/pkg/grpc/user/v2"
|
|
|
|
)
|
|
|
|
|
feat: exchange gRPC server implementation to connectRPC (#10145)
# Which Problems Are Solved
The current maintained gRPC server in combination with a REST (grpc)
gateway is getting harder and harder to maintain. Additionally, there
have been and still are issues with supporting / displaying `oneOf`s
correctly.
We therefore decided to exchange the server implementation to
connectRPC, which apart from supporting connect as protocol, also also
"standard" gRCP clients as well as HTTP/1.1 / rest like clients, e.g.
curl directly call the server without any additional gateway.
# How the Problems Are Solved
- All v2 services are moved to connectRPC implementation. (v1 services
are still served as pure grpc servers)
- All gRPC server interceptors were migrated / copied to a corresponding
connectRPC interceptor.
- API.ListGrpcServices and API. ListGrpcMethods were changed to include
the connect services and endpoints.
- gRPC server reflection was changed to a `StaticReflector` using the
`ListGrpcServices` list.
- The `grpc.Server` interfaces was split into different combinations to
be able to handle the different cases (grpc server and prefixed gateway,
connect server with grpc gateway, connect server only, ...)
- Docs of services serving connectRPC only with no additional gateway
(instance, webkey, project, app, org v2 beta) are changed to expose that
- since the plugin is not yet available on buf, we download it using
`postinstall` hook of the docs
# Additional Changes
- WebKey service is added as v2 service (in addition to the current
v2beta)
# Additional Context
closes #9483
---------
Co-authored-by: Elio Bischof <elio@zitadel.com>
2025-07-04 10:06:20 -04:00
|
|
|
func (s *Server) ListKeys(ctx context.Context, req *connect.Request[user.ListKeysRequest]) (*connect.Response[user.ListKeysResponse], error) {
|
|
|
|
offset, limit, asc, err := filter.PaginationPbToQuery(s.systemDefaults, req.Msg.GetPagination())
|
2025-06-04 09:17:23 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
feat: exchange gRPC server implementation to connectRPC (#10145)
# Which Problems Are Solved
The current maintained gRPC server in combination with a REST (grpc)
gateway is getting harder and harder to maintain. Additionally, there
have been and still are issues with supporting / displaying `oneOf`s
correctly.
We therefore decided to exchange the server implementation to
connectRPC, which apart from supporting connect as protocol, also also
"standard" gRCP clients as well as HTTP/1.1 / rest like clients, e.g.
curl directly call the server without any additional gateway.
# How the Problems Are Solved
- All v2 services are moved to connectRPC implementation. (v1 services
are still served as pure grpc servers)
- All gRPC server interceptors were migrated / copied to a corresponding
connectRPC interceptor.
- API.ListGrpcServices and API. ListGrpcMethods were changed to include
the connect services and endpoints.
- gRPC server reflection was changed to a `StaticReflector` using the
`ListGrpcServices` list.
- The `grpc.Server` interfaces was split into different combinations to
be able to handle the different cases (grpc server and prefixed gateway,
connect server with grpc gateway, connect server only, ...)
- Docs of services serving connectRPC only with no additional gateway
(instance, webkey, project, app, org v2 beta) are changed to expose that
- since the plugin is not yet available on buf, we download it using
`postinstall` hook of the docs
# Additional Changes
- WebKey service is added as v2 service (in addition to the current
v2beta)
# Additional Context
closes #9483
---------
Co-authored-by: Elio Bischof <elio@zitadel.com>
2025-07-04 10:06:20 -04:00
|
|
|
filters, err := keyFiltersToQueries(req.Msg.GetFilters())
|
2025-06-04 09:17:23 +02:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
search := &query.AuthNKeySearchQueries{
|
|
|
|
SearchRequest: query.SearchRequest{
|
|
|
|
Offset: offset,
|
|
|
|
Limit: limit,
|
|
|
|
Asc: asc,
|
feat: exchange gRPC server implementation to connectRPC (#10145)
# Which Problems Are Solved
The current maintained gRPC server in combination with a REST (grpc)
gateway is getting harder and harder to maintain. Additionally, there
have been and still are issues with supporting / displaying `oneOf`s
correctly.
We therefore decided to exchange the server implementation to
connectRPC, which apart from supporting connect as protocol, also also
"standard" gRCP clients as well as HTTP/1.1 / rest like clients, e.g.
curl directly call the server without any additional gateway.
# How the Problems Are Solved
- All v2 services are moved to connectRPC implementation. (v1 services
are still served as pure grpc servers)
- All gRPC server interceptors were migrated / copied to a corresponding
connectRPC interceptor.
- API.ListGrpcServices and API. ListGrpcMethods were changed to include
the connect services and endpoints.
- gRPC server reflection was changed to a `StaticReflector` using the
`ListGrpcServices` list.
- The `grpc.Server` interfaces was split into different combinations to
be able to handle the different cases (grpc server and prefixed gateway,
connect server with grpc gateway, connect server only, ...)
- Docs of services serving connectRPC only with no additional gateway
(instance, webkey, project, app, org v2 beta) are changed to expose that
- since the plugin is not yet available on buf, we download it using
`postinstall` hook of the docs
# Additional Changes
- WebKey service is added as v2 service (in addition to the current
v2beta)
# Additional Context
closes #9483
---------
Co-authored-by: Elio Bischof <elio@zitadel.com>
2025-07-04 10:06:20 -04:00
|
|
|
SortingColumn: authnKeyFieldNameToSortingColumn(req.Msg.SortingColumn),
|
2025-06-04 09:17:23 +02:00
|
|
|
},
|
|
|
|
Queries: filters,
|
|
|
|
}
|
|
|
|
result, err := s.query.SearchAuthNKeys(ctx, search, query.JoinFilterUserMachine, s.checkPermission)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
resp := &user.ListKeysResponse{
|
|
|
|
Result: make([]*user.Key, len(result.AuthNKeys)),
|
|
|
|
Pagination: filter.QueryToPaginationPb(search.SearchRequest, result.SearchResponse),
|
|
|
|
}
|
|
|
|
for i, key := range result.AuthNKeys {
|
|
|
|
resp.Result[i] = &user.Key{
|
|
|
|
CreationDate: timestamppb.New(key.CreationDate),
|
|
|
|
ChangeDate: timestamppb.New(key.ChangeDate),
|
|
|
|
Id: key.ID,
|
|
|
|
UserId: key.AggregateID,
|
|
|
|
OrganizationId: key.ResourceOwner,
|
|
|
|
ExpirationDate: timestamppb.New(key.Expiration),
|
|
|
|
}
|
|
|
|
}
|
feat: exchange gRPC server implementation to connectRPC (#10145)
# Which Problems Are Solved
The current maintained gRPC server in combination with a REST (grpc)
gateway is getting harder and harder to maintain. Additionally, there
have been and still are issues with supporting / displaying `oneOf`s
correctly.
We therefore decided to exchange the server implementation to
connectRPC, which apart from supporting connect as protocol, also also
"standard" gRCP clients as well as HTTP/1.1 / rest like clients, e.g.
curl directly call the server without any additional gateway.
# How the Problems Are Solved
- All v2 services are moved to connectRPC implementation. (v1 services
are still served as pure grpc servers)
- All gRPC server interceptors were migrated / copied to a corresponding
connectRPC interceptor.
- API.ListGrpcServices and API. ListGrpcMethods were changed to include
the connect services and endpoints.
- gRPC server reflection was changed to a `StaticReflector` using the
`ListGrpcServices` list.
- The `grpc.Server` interfaces was split into different combinations to
be able to handle the different cases (grpc server and prefixed gateway,
connect server with grpc gateway, connect server only, ...)
- Docs of services serving connectRPC only with no additional gateway
(instance, webkey, project, app, org v2 beta) are changed to expose that
- since the plugin is not yet available on buf, we download it using
`postinstall` hook of the docs
# Additional Changes
- WebKey service is added as v2 service (in addition to the current
v2beta)
# Additional Context
closes #9483
---------
Co-authored-by: Elio Bischof <elio@zitadel.com>
2025-07-04 10:06:20 -04:00
|
|
|
return connect.NewResponse(resp), nil
|
2025-06-04 09:17:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
func keyFiltersToQueries(filters []*user.KeysSearchFilter) (_ []query.SearchQuery, err error) {
|
|
|
|
q := make([]query.SearchQuery, len(filters))
|
|
|
|
for i, filter := range filters {
|
|
|
|
q[i], err = keyFilterToQuery(filter)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return q, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func keyFilterToQuery(filter *user.KeysSearchFilter) (query.SearchQuery, error) {
|
|
|
|
switch q := filter.Filter.(type) {
|
|
|
|
case *user.KeysSearchFilter_CreatedDateFilter:
|
|
|
|
return authnKeyCreatedFilterToQuery(q.CreatedDateFilter)
|
|
|
|
case *user.KeysSearchFilter_ExpirationDateFilter:
|
|
|
|
return authnKeyExpirationFilterToQuery(q.ExpirationDateFilter)
|
|
|
|
case *user.KeysSearchFilter_KeyIdFilter:
|
|
|
|
return authnKeyIdFilterToQuery(q.KeyIdFilter)
|
|
|
|
case *user.KeysSearchFilter_UserIdFilter:
|
|
|
|
return authnKeyUserIdFilterToQuery(q.UserIdFilter)
|
|
|
|
case *user.KeysSearchFilter_OrganizationIdFilter:
|
|
|
|
return authnKeyOrgIdFilterToQuery(q.OrganizationIdFilter)
|
|
|
|
default:
|
|
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "GRPC-vR9nC", "List.Query.Invalid")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func authnKeyIdFilterToQuery(f *filter_pb.IDFilter) (query.SearchQuery, error) {
|
|
|
|
return query.NewAuthNKeyIDQuery(f.Id)
|
|
|
|
}
|
|
|
|
|
|
|
|
func authnKeyUserIdFilterToQuery(f *filter_pb.IDFilter) (query.SearchQuery, error) {
|
|
|
|
return query.NewAuthNKeyIdentifyerQuery(f.Id)
|
|
|
|
}
|
|
|
|
|
|
|
|
func authnKeyOrgIdFilterToQuery(f *filter_pb.IDFilter) (query.SearchQuery, error) {
|
|
|
|
return query.NewAuthNKeyResourceOwnerQuery(f.Id)
|
|
|
|
}
|
|
|
|
|
|
|
|
func authnKeyCreatedFilterToQuery(f *filter_pb.TimestampFilter) (query.SearchQuery, error) {
|
|
|
|
return query.NewAuthNKeyCreationDateQuery(f.Timestamp.AsTime(), filter.TimestampMethodPbToQuery(f.Method))
|
|
|
|
}
|
|
|
|
|
|
|
|
func authnKeyExpirationFilterToQuery(f *filter_pb.TimestampFilter) (query.SearchQuery, error) {
|
|
|
|
return query.NewAuthNKeyExpirationDateDateQuery(f.Timestamp.AsTime(), filter.TimestampMethodPbToQuery(f.Method))
|
|
|
|
}
|
|
|
|
|
|
|
|
// authnKeyFieldNameToSortingColumn defaults to the creation date because this ensures deterministic pagination
|
|
|
|
func authnKeyFieldNameToSortingColumn(field *user.KeyFieldName) query.Column {
|
|
|
|
if field == nil {
|
|
|
|
return query.AuthNKeyColumnCreationDate
|
|
|
|
}
|
|
|
|
switch *field {
|
|
|
|
case user.KeyFieldName_KEY_FIELD_NAME_UNSPECIFIED:
|
|
|
|
return query.AuthNKeyColumnCreationDate
|
|
|
|
case user.KeyFieldName_KEY_FIELD_NAME_ID:
|
|
|
|
return query.AuthNKeyColumnID
|
|
|
|
case user.KeyFieldName_KEY_FIELD_NAME_USER_ID:
|
|
|
|
return query.AuthNKeyColumnIdentifier
|
|
|
|
case user.KeyFieldName_KEY_FIELD_NAME_ORGANIZATION_ID:
|
|
|
|
return query.AuthNKeyColumnResourceOwner
|
|
|
|
case user.KeyFieldName_KEY_FIELD_NAME_CREATED_DATE:
|
|
|
|
return query.AuthNKeyColumnCreationDate
|
|
|
|
case user.KeyFieldName_KEY_FIELD_NAME_KEY_EXPIRATION_DATE:
|
|
|
|
return query.AuthNKeyColumnExpiration
|
|
|
|
default:
|
|
|
|
return query.AuthNKeyColumnCreationDate
|
|
|
|
}
|
|
|
|
}
|