mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-23 16:02:14 +00:00
4aacfa842f
# Which Problems Are Solved Currently, metadata can be set/updated only for human users, but it should be available also for service accounts (machine users). # How the Problems Are Solved This is achieved by: - adding a metadata field at the root level in `CreateUserRequest`, which makes it available for both `human` and `machine` user types - returning an error when both the root level and human-level `metadata` fields are set in the `CreateUserRequest` - setting `human` and `machine` metadata from the root `metadata` field in the server layer - pushing `user.metadata.set` event during machine user creation in the command layer - adding integration tests # Additional Changes N/A # Additional Context - Related to https://github.com/zitadel/zitadel/issues/11369 --------- Co-authored-by: Vitor Bari Buccianti <[email protected]> Co-authored-by: Silvan <[email protected]>
86 lines
2.7 KiB
Go
86 lines
2.7 KiB
Go
package user
|
|
|
|
import (
|
|
"context"
|
|
|
|
"connectrpc.com/connect"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
|
"github.com/zitadel/zitadel/pkg/grpc/user/v2"
|
|
)
|
|
|
|
func (s *Server) createUserTypeMachine(ctx context.Context, machinePb *user.CreateUserRequest_Machine, orgId, userName, userId string, reqMetadata []*user.Metadata) (*connect.Response[user.CreateUserResponse], error) {
|
|
metadata := make([]*command.AddMetadataEntry, len(reqMetadata))
|
|
for i, metadataEntry := range reqMetadata {
|
|
metadata[i] = &command.AddMetadataEntry{
|
|
Key: metadataEntry.GetKey(),
|
|
Value: metadataEntry.GetValue(),
|
|
}
|
|
}
|
|
cmd := &command.Machine{
|
|
Username: userName,
|
|
Name: machinePb.Name,
|
|
Description: machinePb.GetDescription(),
|
|
AccessTokenType: accessTokenTypeToDomain(machinePb.GetAccessTokenType()),
|
|
ObjectRoot: models.ObjectRoot{
|
|
ResourceOwner: orgId,
|
|
AggregateID: userId,
|
|
},
|
|
Metadata: metadata,
|
|
}
|
|
details, err := s.command.AddMachine(
|
|
ctx,
|
|
cmd,
|
|
nil,
|
|
s.command.NewPermissionCheckUserWrite(ctx, true),
|
|
command.AddMachineWithUsernameToIDFallback(),
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&user.CreateUserResponse{
|
|
Id: cmd.AggregateID,
|
|
CreationDate: timestamppb.New(details.EventDate),
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) updateUserTypeMachine(ctx context.Context, machinePb *user.UpdateUserRequest_Machine, userId string, userName *string) (*connect.Response[user.UpdateUserResponse], error) {
|
|
cmd := updateMachineUserToCommand(userId, userName, machinePb)
|
|
err := s.command.ChangeUserMachine(ctx, cmd)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&user.UpdateUserResponse{
|
|
ChangeDate: timestamppb.New(cmd.Details.EventDate),
|
|
}), nil
|
|
}
|
|
|
|
func updateMachineUserToCommand(userId string, userName *string, machine *user.UpdateUserRequest_Machine) *command.ChangeMachine {
|
|
var accessTokenType *domain.OIDCTokenType
|
|
if machine.AccessTokenType != nil {
|
|
tokenType := accessTokenTypeToDomain(*machine.AccessTokenType)
|
|
accessTokenType = &tokenType
|
|
}
|
|
return &command.ChangeMachine{
|
|
ID: userId,
|
|
Username: userName,
|
|
Name: machine.Name,
|
|
Description: machine.Description,
|
|
AccessTokenType: accessTokenType,
|
|
}
|
|
}
|
|
|
|
func accessTokenTypeToDomain(accessTokenType user.AccessTokenType) domain.OIDCTokenType {
|
|
switch accessTokenType {
|
|
case user.AccessTokenType_ACCESS_TOKEN_TYPE_BEARER:
|
|
return domain.OIDCTokenTypeBearer
|
|
case user.AccessTokenType_ACCESS_TOKEN_TYPE_JWT:
|
|
return domain.OIDCTokenTypeJWT
|
|
default:
|
|
return domain.OIDCTokenTypeBearer
|
|
}
|
|
}
|