mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-15 16:08:46 +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>
95 lines
2.6 KiB
Go
95 lines
2.6 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type ChangeMachine struct {
|
|
ID string
|
|
ResourceOwner string
|
|
Username *string
|
|
Name *string
|
|
Description *string
|
|
|
|
// Details are set after a successful execution of the command
|
|
Details *domain.ObjectDetails
|
|
}
|
|
|
|
func (h *ChangeMachine) Changed() bool {
|
|
if h.Username != nil {
|
|
return true
|
|
}
|
|
if h.Name != nil {
|
|
return true
|
|
}
|
|
if h.Description != nil {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (c *Commands) ChangeUserMachine(ctx context.Context, machine *ChangeMachine) (err error) {
|
|
existingMachine, err := c.UserMachineWriteModel(
|
|
ctx,
|
|
machine.ID,
|
|
machine.ResourceOwner,
|
|
false,
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if machine.Changed() {
|
|
if err := c.checkPermissionUpdateUser(ctx, existingMachine.ResourceOwner, existingMachine.AggregateID); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
cmds := make([]eventstore.Command, 0)
|
|
if machine.Username != nil {
|
|
cmds, err = c.changeUsername(ctx, cmds, existingMachine, *machine.Username)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
var machineChanges []user.MachineChanges
|
|
if machine.Name != nil && *machine.Name != existingMachine.Name {
|
|
machineChanges = append(machineChanges, user.ChangeName(*machine.Name))
|
|
}
|
|
if machine.Description != nil && *machine.Description != existingMachine.Description {
|
|
machineChanges = append(machineChanges, user.ChangeDescription(*machine.Description))
|
|
}
|
|
if len(machineChanges) > 0 {
|
|
cmds = append(cmds, user.NewMachineChangedEvent(ctx, &existingMachine.Aggregate().Aggregate, machineChanges))
|
|
}
|
|
if len(cmds) == 0 {
|
|
machine.Details = writeModelToObjectDetails(&existingMachine.WriteModel)
|
|
return nil
|
|
}
|
|
err = c.pushAppendAndReduce(ctx, existingMachine, cmds...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
machine.Details = writeModelToObjectDetails(&existingMachine.WriteModel)
|
|
return nil
|
|
}
|
|
|
|
func (c *Commands) UserMachineWriteModel(ctx context.Context, userID, resourceOwner string, metadataWM bool) (writeModel *UserV2WriteModel, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
writeModel = NewUserMachineWriteModel(userID, resourceOwner, metadataWM)
|
|
err = c.eventstore.FilterToQueryReducer(ctx, writeModel)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !isUserStateExists(writeModel.UserState) {
|
|
return nil, zerrors.ThrowNotFound(nil, "COMMAND-ugjs0upun6", "Errors.User.NotFound")
|
|
}
|
|
return writeModel, nil
|
|
}
|