mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-17 13:27:34 +00:00
a0a82b59e1
* feat: user service v2 remove user * feat: user service v2 add user human * feat: user service v2 change user human * feat: user service v2 change user human unit tests * feat: user service v2 reactivate, deactivate, lock, unlock user * feat: user service v2 integration tests * fix: merge back origin/main * lint: linter corrections * fix: move permission check for isVerfied and password change * fix: add deprecated notices and other review comments * fix: consistent naming in proto * fix: errors package renaming * fix: remove / delete user renaming in integration test * fix: machine user status changes through user v2 api * fix: linting changes * fix: linting changes * fix: changes from review * fix: changes from review * fix: changes from review * fix: changes from review * fix: changes from review --------- Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> Co-authored-by: Livio Spring <livio.a@gmail.com>
203 lines
7.2 KiB
Go
203 lines
7.2 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/zitadel/internal/command/preparation"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
func (c *Commands) AddOrgDomainPolicy(ctx context.Context, resourceOwner string, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain bool) (*domain.ObjectDetails, error) {
|
|
if resourceOwner == "" {
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "Org-4Jfsf", "Errors.ResourceOwnerMissing")
|
|
}
|
|
orgAgg := org.NewAggregate(resourceOwner)
|
|
cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareAddOrgDomainPolicy(orgAgg, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
pushedEvents, err := c.eventstore.Push(ctx, cmds...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return pushedEventsToObjectDetails(pushedEvents), nil
|
|
}
|
|
|
|
func (c *Commands) ChangeOrgDomainPolicy(ctx context.Context, resourceOwner string, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain bool) (*domain.ObjectDetails, error) {
|
|
if resourceOwner == "" {
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "Org-5H8fs", "Errors.ResourceOwnerMissing")
|
|
}
|
|
orgAgg := org.NewAggregate(resourceOwner)
|
|
cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareChangeOrgDomainPolicy(orgAgg, userLoginMustBeDomain, validateOrgDomains, smtpSenderAddressMatchesInstanceDomain))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
pushedEvents, err := c.eventstore.Push(ctx, cmds...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return pushedEventsToObjectDetails(pushedEvents), nil
|
|
}
|
|
|
|
func (c *Commands) RemoveOrgDomainPolicy(ctx context.Context, orgID string) (*domain.ObjectDetails, error) {
|
|
if orgID == "" {
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "Org-3H8fs", "Errors.ResourceOwnerMissing")
|
|
}
|
|
orgAgg := org.NewAggregate(orgID)
|
|
cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, prepareRemoveOrgDomainPolicy(orgAgg))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
pushedEvents, err := c.eventstore.Push(ctx, cmds...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return pushedEventsToObjectDetails(pushedEvents), nil
|
|
}
|
|
|
|
// Deprecated: Use commands.domainPolicyWriteModel directly, to remove the domain.DomainPolicy struct
|
|
func (c *Commands) getOrgDomainPolicy(ctx context.Context, orgID string) (*domain.DomainPolicy, error) {
|
|
policy, err := c.orgDomainPolicyWriteModel(ctx, orgID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if policy.State.Exists() {
|
|
return orgWriteModelToDomainPolicy(policy), nil
|
|
}
|
|
return c.getDefaultDomainPolicy(ctx)
|
|
}
|
|
|
|
func (c *Commands) orgDomainPolicyWriteModel(ctx context.Context, orgID string) (policy *OrgDomainPolicyWriteModel, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
writeModel := NewOrgDomainPolicyWriteModel(orgID)
|
|
err = c.eventstore.FilterToQueryReducer(ctx, writeModel)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return writeModel, nil
|
|
}
|
|
|
|
func prepareAddOrgDomainPolicy(
|
|
a *org.Aggregate,
|
|
userLoginMustBeDomain,
|
|
validateOrgDomains,
|
|
smtpSenderAddressMatchesInstanceDomain bool,
|
|
) preparation.Validation {
|
|
return func() (preparation.CreateCommands, error) {
|
|
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
|
|
writeModel, err := orgDomainPolicy(ctx, filter, a.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if writeModel.State == domain.PolicyStateActive {
|
|
return nil, zerrors.ThrowAlreadyExists(nil, "ORG-1M8ds", "Errors.Org.DomainPolicy.AlreadyExists")
|
|
}
|
|
cmds := []eventstore.Command{
|
|
org.NewDomainPolicyAddedEvent(ctx, &a.Aggregate,
|
|
userLoginMustBeDomain,
|
|
validateOrgDomains,
|
|
smtpSenderAddressMatchesInstanceDomain,
|
|
),
|
|
}
|
|
instancePolicy, err := instanceDomainPolicy(ctx, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// regardless if the UserLoginMustBeDomain setting is true or false,
|
|
// if it will be the same value as currently on the instance,
|
|
// then there no further changes are needed
|
|
if instancePolicy.UserLoginMustBeDomain == userLoginMustBeDomain {
|
|
return cmds, nil
|
|
}
|
|
// the UserLoginMustBeDomain setting will be different from the instance
|
|
// therefore get all usernames and the current primary domain
|
|
usersWriteModel, err := domainPolicyUsernames(ctx, filter, a.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return append(cmds, usersWriteModel.NewUsernameChangedEvents(ctx, userLoginMustBeDomain)...), nil
|
|
}, nil
|
|
}
|
|
}
|
|
|
|
func prepareChangeOrgDomainPolicy(
|
|
a *org.Aggregate,
|
|
userLoginMustBeDomain,
|
|
validateOrgDomains,
|
|
smtpSenderAddressMatchesInstanceDomain bool,
|
|
) preparation.Validation {
|
|
return func() (preparation.CreateCommands, error) {
|
|
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
|
|
writeModel, err := orgDomainPolicy(ctx, filter, a.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !writeModel.State.Exists() {
|
|
return nil, zerrors.ThrowNotFound(nil, "ORG-2N9sd", "Errors.Org.DomainPolicy.NotFound")
|
|
}
|
|
changedEvent, usernameChange, err := writeModel.NewChangedEvent(ctx, &a.Aggregate,
|
|
userLoginMustBeDomain,
|
|
validateOrgDomains,
|
|
smtpSenderAddressMatchesInstanceDomain,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cmds := []eventstore.Command{changedEvent}
|
|
// if the UserLoginMustBeDomain has not changed, no further changes are needed
|
|
if !usernameChange {
|
|
return cmds, err
|
|
}
|
|
// get all usernames and the primary domain
|
|
usersWriteModel, err := domainPolicyUsernames(ctx, filter, a.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// to compute the username changed events
|
|
return append(cmds, usersWriteModel.NewUsernameChangedEvents(ctx, userLoginMustBeDomain)...), nil
|
|
}, nil
|
|
}
|
|
}
|
|
|
|
func prepareRemoveOrgDomainPolicy(
|
|
a *org.Aggregate,
|
|
) preparation.Validation {
|
|
return func() (preparation.CreateCommands, error) {
|
|
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
|
|
writeModel, err := orgDomainPolicy(ctx, filter, a.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !writeModel.State.Exists() {
|
|
return nil, zerrors.ThrowNotFound(nil, "ORG-Dvsh3", "Errors.Org.DomainPolicy.NotFound")
|
|
}
|
|
instancePolicy, err := instanceDomainPolicy(ctx, filter)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cmds := []eventstore.Command{
|
|
org.NewDomainPolicyRemovedEvent(ctx, &a.Aggregate),
|
|
}
|
|
// regardless if the UserLoginMustBeDomain setting is true or false,
|
|
// if it will be the same value as currently on the instance,
|
|
// then there no further changes are needed
|
|
if instancePolicy.UserLoginMustBeDomain == writeModel.UserLoginMustBeDomain {
|
|
return cmds, nil
|
|
}
|
|
// get all usernames and the primary domain
|
|
usersWriteModel, err := domainPolicyUsernames(ctx, filter, a.ID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// to compute the username changed events
|
|
return append(cmds, usersWriteModel.NewUsernameChangedEvents(ctx, instancePolicy.UserLoginMustBeDomain)...), nil
|
|
}, nil
|
|
}
|
|
}
|