mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-13 10:48:32 +00:00

# Which Problems Are Solved This pull request addresses a significant gap in the user service v2 API, which currently lacks methods for managing machine users. # How the Problems Are Solved This PR adds new API endpoints to the user service v2 to manage machine users including their secret, keys and personal access tokens. Additionally, there's now a CreateUser and UpdateUser endpoints which allow to create either a human or machine user and update them. The existing `CreateHumanUser` endpoint has been deprecated along the corresponding management service endpoints. For details check the additional context section. # Additional Context - Closes https://github.com/zitadel/zitadel/issues/9349 ## More details - API changes: https://github.com/zitadel/zitadel/pull/9680 - Implementation: https://github.com/zitadel/zitadel/pull/9763 - Tests: https://github.com/zitadel/zitadel/pull/9771 ## Follow-ups - Metadata: support managing user metadata using resource API https://github.com/zitadel/zitadel/pull/10005 - Machine token type: support managing the machine token type (migrate to new enum with zero value unspecified?) --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Livio Spring <livio.a@gmail.com>
125 lines
4.2 KiB
Go
125 lines
4.2 KiB
Go
package user
|
|
|
|
import (
|
|
"context"
|
|
|
|
"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"
|
|
)
|
|
|
|
func (s *Server) ListKeys(ctx context.Context, req *user.ListKeysRequest) (*user.ListKeysResponse, error) {
|
|
offset, limit, asc, err := filter.PaginationPbToQuery(s.systemDefaults, req.Pagination)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
filters, err := keyFiltersToQueries(req.Filters)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
search := &query.AuthNKeySearchQueries{
|
|
SearchRequest: query.SearchRequest{
|
|
Offset: offset,
|
|
Limit: limit,
|
|
Asc: asc,
|
|
SortingColumn: authnKeyFieldNameToSortingColumn(req.SortingColumn),
|
|
},
|
|
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),
|
|
}
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
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
|
|
}
|
|
}
|