TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(eventstore): increase parallel write capabilities (#5940)

Browse Source 
This implementation increases parallel write capabilities of the eventstore.
Please have a look at the technical advisories: [05](https://zitadel.com/docs/support/advisory/a10005) and  [06](https://zitadel.com/docs/support/advisory/a10006).
The implementation of eventstore.push is rewritten and stored events are migrated to a new table `eventstore.events2`.
If you are using cockroach: make sure that the database user of ZITADEL has `VIEWACTIVITY` grant. This is used to query events.
This commit is contained in:
Silvan
2023-10-19 12:19:10 +02:00
committed by GitHub
parent 259faba3f0
commit b5564572bc
791 changed files with 30326 additions and 43202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
internal/repository/user/human.go
View File

@@ -2,7 +2,6 @@ package user
import (
"context"
"encoding/json"
"time"
"golang.org/x/text/language"
@@ -12,7 +11,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -56,12 +54,12 @@ type HumanAddedEvent struct {
ChangeRequired bool `json:"changeRequired,omitempty"`
}
func (e *HumanAddedEvent) Data() interface{} {
func (e *HumanAddedEvent) Payload() interface{} {
return e
}
func (e *HumanAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
func (e *HumanAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
}
func (e *HumanAddedEvent) AddAddressData(
@@ -124,13 +122,13 @@ func NewHumanAddedEvent(
}
}
func HumanAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
humanAdded := &HumanAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, humanAdded)
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal human added")
return nil, errors.ThrowInternal(err, "USER-vGlhy", "unable to unmarshal human added")
}
return humanAdded, nil
@@ -161,12 +159,12 @@ type HumanRegisteredEvent struct {
ChangeRequired bool `json:"changeRequired,omitempty"`
}
func (e *HumanRegisteredEvent) Data() interface{} {
func (e *HumanRegisteredEvent) Payload() interface{} {
return e
}
func (e *HumanRegisteredEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
func (e *HumanRegisteredEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
}
func (e *HumanRegisteredEvent) AddAddressData(
@@ -229,11 +227,11 @@ func NewHumanRegisteredEvent(
}
}
func HumanRegisteredEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanRegisteredEventMapper(event eventstore.Event) (eventstore.Event, error) {
humanRegistered := &HumanRegisteredEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, humanRegistered)
err := event.Unmarshal(humanRegistered)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-3Vm9s", "unable to unmarshal human registered")
}
@@ -248,11 +246,11 @@ type HumanInitialCodeAddedEvent struct {
TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
}
func (e *HumanInitialCodeAddedEvent) Data() interface{} {
func (e *HumanInitialCodeAddedEvent) Payload() interface{} {
return e
}
func (e *HumanInitialCodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanInitialCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -278,11 +276,11 @@ func NewHumanInitialCodeAddedEvent(
}
}
func HumanInitialCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanInitialCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
humanRegistered := &HumanInitialCodeAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, humanRegistered)
err := event.Unmarshal(humanRegistered)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-bM9se", "unable to unmarshal human initial code added")
}
@@ -294,11 +292,11 @@ type HumanInitialCodeSentEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanInitialCodeSentEvent) Data() interface{} {
func (e *HumanInitialCodeSentEvent) Payload() interface{} {
return nil
}
func (e *HumanInitialCodeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanInitialCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -312,7 +310,7 @@ func NewHumanInitialCodeSentEvent(ctx context.Context, aggregate *eventstore.Agg
}
}
func HumanInitialCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanInitialCodeSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanInitialCodeSentEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -322,11 +320,11 @@ type HumanInitializedCheckSucceededEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanInitializedCheckSucceededEvent) Data() interface{} {
func (e *HumanInitializedCheckSucceededEvent) Payload() interface{} {
return nil
}
func (e *HumanInitializedCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanInitializedCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -340,7 +338,7 @@ func NewHumanInitializedCheckSucceededEvent(ctx context.Context, aggregate *even
}
}
func HumanInitializedCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanInitializedCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanInitializedCheckSucceededEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -350,11 +348,11 @@ type HumanInitializedCheckFailedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanInitializedCheckFailedEvent) Data() interface{} {
func (e *HumanInitializedCheckFailedEvent) Payload() interface{} {
return nil
}
func (e *HumanInitializedCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanInitializedCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -368,7 +366,7 @@ func NewHumanInitializedCheckFailedEvent(ctx context.Context, aggregate *eventst
}
}
func HumanInitializedCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanInitializedCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanInitializedCheckFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -380,11 +378,11 @@ type HumanSignedOutEvent struct {
UserAgentID string `json:"userAgentID"`
}
func (e *HumanSignedOutEvent) Data() interface{} {
func (e *HumanSignedOutEvent) Payload() interface{} {
return e
}
func (e *HumanSignedOutEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanSignedOutEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -403,11 +401,11 @@ func NewHumanSignedOutEvent(
}
}
func HumanSignedOutEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanSignedOutEventMapper(event eventstore.Event) (eventstore.Event, error) {
signedOut := &HumanSignedOutEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, signedOut)
err := event.Unmarshal(signedOut)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-WFS3g", "unable to unmarshal human signed out")
}

13
internal/repository/user/human_address.go
View File

@@ -2,12 +2,9 @@ package user
import (
"context"
"encoding/json"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
)
const (
@@ -25,11 +22,11 @@ type HumanAddressChangedEvent struct {
StreetAddress *string `json:"streetAddress,omitempty"`
}
func (e *HumanAddressChangedEvent) Data() interface{} {
func (e *HumanAddressChangedEvent) Payload() interface{} {
return e
}
func (e *HumanAddressChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanAddressChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -86,11 +83,11 @@ func ChangeStreetAddress(street string) func(event *HumanAddressChangedEvent) {
}
}
func HumanAddressChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanAddressChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
addressChanged := &HumanAddressChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, addressChanged)
err := event.Unmarshal(addressChanged)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human address changed")
}

5
internal/repository/user/human_avatar.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/asset"
)
@@ -29,7 +28,7 @@ func NewHumanAvatarAddedEvent(ctx context.Context, aggregate *eventstore.Aggrega
}
}
func HumanAvatarAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanAvatarAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := asset.AddedEventMapper(event)
if err != nil {
return nil, err
@@ -53,7 +52,7 @@ func NewHumanAvatarRemovedEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func HumanAvatarRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanAvatarRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := asset.RemovedEventMapper(event)
if err != nil {
return nil, err

36
internal/repository/user/human_email.go
View File

@@ -2,7 +2,6 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/api/http"
@@ -10,7 +9,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -29,11 +27,11 @@ type HumanEmailChangedEvent struct {
EmailAddress domain.EmailAddress `json:"email,omitempty"`
}
func (e *HumanEmailChangedEvent) Data() interface{} {
func (e *HumanEmailChangedEvent) Payload() interface{} {
return e
}
func (e *HumanEmailChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanEmailChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -48,11 +46,11 @@ func NewHumanEmailChangedEvent(ctx context.Context, aggregate *eventstore.Aggreg
}
}
func HumanEmailChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanEmailChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
emailChangedEvent := &HumanEmailChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, emailChangedEvent)
err := event.Unmarshal(emailChangedEvent)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed")
}
@@ -66,11 +64,11 @@ type HumanEmailVerifiedEvent struct {
IsEmailVerified bool `json:"-"`
}
func (e *HumanEmailVerifiedEvent) Data() interface{} {
func (e *HumanEmailVerifiedEvent) Payload() interface{} {
return nil
}
func (e *HumanEmailVerifiedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanEmailVerifiedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -84,7 +82,7 @@ func NewHumanEmailVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func HumanEmailVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanEmailVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
emailVerified := &HumanEmailVerifiedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
IsEmailVerified: true,
@@ -96,11 +94,11 @@ type HumanEmailVerificationFailedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanEmailVerificationFailedEvent) Data() interface{} {
func (e *HumanEmailVerificationFailedEvent) Payload() interface{} {
return nil
}
func (e *HumanEmailVerificationFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanEmailVerificationFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -114,7 +112,7 @@ func NewHumanEmailVerificationFailedEvent(ctx context.Context, aggregate *events
}
}
func HumanEmailVerificationFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanEmailVerificationFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanEmailVerificationFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -130,11 +128,11 @@ type HumanEmailCodeAddedEvent struct {
TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
}
func (e *HumanEmailCodeAddedEvent) Data() interface{} {
func (e *HumanEmailCodeAddedEvent) Payload() interface{} {
return e
}
func (e *HumanEmailCodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanEmailCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -173,11 +171,11 @@ func NewHumanEmailCodeAddedEventV2(
}
}
func HumanEmailCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanEmailCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
codeAdded := &HumanEmailCodeAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, codeAdded)
err := event.Unmarshal(codeAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-3M0sd", "unable to unmarshal human email code added")
}
@@ -189,11 +187,11 @@ type HumanEmailCodeSentEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanEmailCodeSentEvent) Data() interface{} {
func (e *HumanEmailCodeSentEvent) Payload() interface{} {
return nil
}
func (e *HumanEmailCodeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanEmailCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -207,7 +205,7 @@ func NewHumanEmailCodeSentEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func HumanEmailCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanEmailCodeSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanEmailCodeSentEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil

55
internal/repository/user/human_external_idp.go
View File

@@ -2,12 +2,9 @@ package user
import (
"context"
"encoding/json"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
)
const (
@@ -23,15 +20,15 @@ const (
UserIDPLoginCheckSucceededType = idpLoginEventPrefix + "check.succeeded"
)
func NewAddUserIDPLinkUniqueConstraint(idpConfigID, externalUserID string) *eventstore.EventUniqueConstraint {
func NewAddUserIDPLinkUniqueConstraint(idpConfigID, externalUserID string) *eventstore.UniqueConstraint {
return eventstore.NewAddEventUniqueConstraint(
UniqueUserIDPLinkType,
idpConfigID+externalUserID,
"Errors.User.ExternalIDP.AlreadyExists")
}
func NewRemoveUserIDPLinkUniqueConstraint(idpConfigID, externalUserID string) *eventstore.EventUniqueConstraint {
return eventstore.NewRemoveEventUniqueConstraint(
func NewRemoveUserIDPLinkUniqueConstraint(idpConfigID, externalUserID string) *eventstore.UniqueConstraint {
return eventstore.NewRemoveUniqueConstraint(
UniqueUserIDPLinkType,
idpConfigID+externalUserID)
}
@@ -44,12 +41,12 @@ type UserIDPLinkAddedEvent struct {
DisplayName string `json:"displayName,omitempty"`
}
func (e *UserIDPLinkAddedEvent) Data() interface{} {
func (e *UserIDPLinkAddedEvent) Payload() interface{} {
return e
}
func (e *UserIDPLinkAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewAddUserIDPLinkUniqueConstraint(e.IDPConfigID, e.ExternalUserID)}
func (e *UserIDPLinkAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewAddUserIDPLinkUniqueConstraint(e.IDPConfigID, e.ExternalUserID)}
}
func NewUserIDPLinkAddedEvent(
@@ -71,12 +68,12 @@ func NewUserIDPLinkAddedEvent(
}
}
func UserIDPLinkAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserIDPLinkAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &UserIDPLinkAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-6M9sd", "unable to unmarshal user external idp added")
}
@@ -91,12 +88,12 @@ type UserIDPLinkRemovedEvent struct {
ExternalUserID string `json:"userId,omitempty"`
}
func (e *UserIDPLinkRemovedEvent) Data() interface{} {
func (e *UserIDPLinkRemovedEvent) Payload() interface{} {
return e
}
func (e *UserIDPLinkRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewRemoveUserIDPLinkUniqueConstraint(e.IDPConfigID, e.ExternalUserID)}
func (e *UserIDPLinkRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewRemoveUserIDPLinkUniqueConstraint(e.IDPConfigID, e.ExternalUserID)}
}
func NewUserIDPLinkRemovedEvent(
@@ -116,14 +113,14 @@ func NewUserIDPLinkRemovedEvent(
}
}
func UserIDPLinkRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserIDPLinkRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &UserIDPLinkRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal user external idp removed")
return nil, errors.ThrowInternal(err, "USER-eAWoT", "unable to unmarshal user external idp removed")
}
return e, nil
@@ -136,12 +133,12 @@ type UserIDPLinkCascadeRemovedEvent struct {
ExternalUserID string `json:"userId,omitempty"`
}
func (e *UserIDPLinkCascadeRemovedEvent) Data() interface{} {
func (e *UserIDPLinkCascadeRemovedEvent) Payload() interface{} {
return e
}
func (e *UserIDPLinkCascadeRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewRemoveUserIDPLinkUniqueConstraint(e.IDPConfigID, e.ExternalUserID)}
func (e *UserIDPLinkCascadeRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewRemoveUserIDPLinkUniqueConstraint(e.IDPConfigID, e.ExternalUserID)}
}
func NewUserIDPLinkCascadeRemovedEvent(
@@ -161,12 +158,12 @@ func NewUserIDPLinkCascadeRemovedEvent(
}
}
func UserIDPLinkCascadeRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserIDPLinkCascadeRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &UserIDPLinkCascadeRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-dKGqO", "unable to unmarshal user external idp cascade removed")
}
@@ -179,11 +176,11 @@ type UserIDPCheckSucceededEvent struct {
*AuthRequestInfo
}
func (e *UserIDPCheckSucceededEvent) Data() interface{} {
func (e *UserIDPCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *UserIDPCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserIDPCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -201,12 +198,12 @@ func NewUserIDPCheckSucceededEvent(
}
}
func UserIDPCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserIDPCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
e := &UserIDPCheckSucceededEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, e)
err := event.Unmarshal(e)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-oikSS", "unable to unmarshal user external idp check succeeded")
}
@@ -221,11 +218,11 @@ type UserIDPExternalIDMigratedEvent struct {
NewID string `json:"newId"`
}
func (e *UserIDPExternalIDMigratedEvent) Data() interface{} {
func (e *UserIDPExternalIDMigratedEvent) Payload() interface{} {
return e
}
func (e *UserIDPExternalIDMigratedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserIDPExternalIDMigratedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}

8
internal/repository/user/human_mfa_events.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -17,11 +15,11 @@ type HumanMFAInitSkippedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanMFAInitSkippedEvent) Data() interface{} {
func (e *HumanMFAInitSkippedEvent) Payload() interface{} {
return e
}
func (e *HumanMFAInitSkippedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanMFAInitSkippedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -35,7 +33,7 @@ func NewHumanMFAInitSkippedEvent(ctx context.Context, aggregate *eventstore.Aggr
}
}
func HumanMFAInitSkippedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanMFAInitSkippedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanMFAInitSkippedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil

89
internal/repository/user/human_mfa_otp.go
View File

@@ -2,15 +2,12 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
)
const (
@@ -42,11 +39,11 @@ type HumanOTPAddedEvent struct {
Secret *crypto.CryptoValue `json:"otpSecret,omitempty"`
}
func (e *HumanOTPAddedEvent) Data() interface{} {
func (e *HumanOTPAddedEvent) Payload() interface{} {
return e
}
func (e *HumanOTPAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -65,11 +62,11 @@ func NewHumanOTPAddedEvent(
}
}
func HumanOTPAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanOTPAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
otpAdded := &HumanOTPAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, otpAdded)
err := event.Unmarshal(otpAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp added")
}
@@ -81,11 +78,11 @@ type HumanOTPVerifiedEvent struct {
UserAgentID string `json:"userAgentID,omitempty"`
}
func (e *HumanOTPVerifiedEvent) Data() interface{} {
func (e *HumanOTPVerifiedEvent) Payload() interface{} {
return e
}
func (e *HumanOTPVerifiedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPVerifiedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -104,7 +101,7 @@ func NewHumanOTPVerifiedEvent(
}
}
func HumanOTPVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanOTPVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanOTPVerifiedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -114,11 +111,11 @@ type HumanOTPRemovedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanOTPRemovedEvent) Data() interface{} {
func (e *HumanOTPRemovedEvent) Payload() interface{} {
return nil
}
func (e *HumanOTPRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -135,7 +132,7 @@ func NewHumanOTPRemovedEvent(
}
}
func HumanOTPRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanOTPRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanOTPRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -146,11 +143,11 @@ type HumanOTPCheckSucceededEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPCheckSucceededEvent) Data() interface{} {
func (e *HumanOTPCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *HumanOTPCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -169,11 +166,11 @@ func NewHumanOTPCheckSucceededEvent(
}
}
func HumanOTPCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanOTPCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
otpAdded := &HumanOTPCheckSucceededEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, otpAdded)
err := event.Unmarshal(otpAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check succeeded")
}
@@ -185,11 +182,11 @@ type HumanOTPCheckFailedEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPCheckFailedEvent) Data() interface{} {
func (e *HumanOTPCheckFailedEvent) Payload() interface{} {
return e
}
func (e *HumanOTPCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -208,11 +205,11 @@ func NewHumanOTPCheckFailedEvent(
}
}
func HumanOTPCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanOTPCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
otpAdded := &HumanOTPCheckFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, otpAdded)
err := event.Unmarshal(otpAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ns9df", "unable to unmarshal human otp check failed")
}
@@ -223,11 +220,11 @@ type HumanOTPSMSAddedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanOTPSMSAddedEvent) Data() interface{} {
func (e *HumanOTPSMSAddedEvent) Payload() interface{} {
return nil
}
func (e *HumanOTPSMSAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPSMSAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -252,11 +249,11 @@ type HumanOTPSMSRemovedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanOTPSMSRemovedEvent) Data() interface{} {
func (e *HumanOTPSMSRemovedEvent) Payload() interface{} {
return nil
}
func (e *HumanOTPSMSRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPSMSRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -286,11 +283,11 @@ type HumanOTPSMSCodeAddedEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPSMSCodeAddedEvent) Data() interface{} {
func (e *HumanOTPSMSCodeAddedEvent) Payload() interface{} {
return e
}
func (e *HumanOTPSMSCodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPSMSCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -330,11 +327,11 @@ type HumanOTPSMSCodeSentEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPSMSCodeSentEvent) Data() interface{} {
func (e *HumanOTPSMSCodeSentEvent) Payload() interface{} {
return e
}
func (e *HumanOTPSMSCodeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPSMSCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -360,11 +357,11 @@ type HumanOTPSMSCheckSucceededEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPSMSCheckSucceededEvent) Data() interface{} {
func (e *HumanOTPSMSCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *HumanOTPSMSCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPSMSCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -392,11 +389,11 @@ type HumanOTPSMSCheckFailedEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPSMSCheckFailedEvent) Data() interface{} {
func (e *HumanOTPSMSCheckFailedEvent) Payload() interface{} {
return e
}
func (e *HumanOTPSMSCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPSMSCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -423,11 +420,11 @@ type HumanOTPEmailAddedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanOTPEmailAddedEvent) Data() interface{} {
func (e *HumanOTPEmailAddedEvent) Payload() interface{} {
return nil
}
func (e *HumanOTPEmailAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPEmailAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -452,11 +449,11 @@ type HumanOTPEmailRemovedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanOTPEmailRemovedEvent) Data() interface{} {
func (e *HumanOTPEmailRemovedEvent) Payload() interface{} {
return nil
}
func (e *HumanOTPEmailRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPEmailRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -486,11 +483,11 @@ type HumanOTPEmailCodeAddedEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPEmailCodeAddedEvent) Data() interface{} {
func (e *HumanOTPEmailCodeAddedEvent) Payload() interface{} {
return e
}
func (e *HumanOTPEmailCodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPEmailCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -530,11 +527,11 @@ type HumanOTPEmailCodeSentEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPEmailCodeSentEvent) Data() interface{} {
func (e *HumanOTPEmailCodeSentEvent) Payload() interface{} {
return e
}
func (e *HumanOTPEmailCodeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPEmailCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -560,11 +557,11 @@ type HumanOTPEmailCheckSucceededEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPEmailCheckSucceededEvent) Data() interface{} {
func (e *HumanOTPEmailCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *HumanOTPEmailCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPEmailCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -592,11 +589,11 @@ type HumanOTPEmailCheckFailedEvent struct {
*AuthRequestInfo
}
func (e *HumanOTPEmailCheckFailedEvent) Data() interface{} {
func (e *HumanOTPEmailCheckFailedEvent) Payload() interface{} {
return e
}
func (e *HumanOTPEmailCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanOTPEmailCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}

56
internal/repository/user/human_mfa_passwordless.go
View File

@@ -2,7 +2,6 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/api/http"
@@ -10,7 +9,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -56,7 +54,7 @@ func NewHumanPasswordlessAddedEvent(
}
}
func HumanPasswordlessAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNAddedEventMapper(event)
if err != nil {
return nil, err
@@ -100,7 +98,7 @@ func NewHumanPasswordlessVerifiedEvent(
}
}
func HumanPasswordlessVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNVerifiedEventMapper(event)
if err != nil {
return nil, err
@@ -132,7 +130,7 @@ func NewHumanPasswordlessSignCountChangedEvent(
}
}
func HumanPasswordlessSignCountChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessSignCountChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNSignCountChangedEventMapper(event)
if err != nil {
return nil, err
@@ -168,7 +166,7 @@ func NewHumanPasswordlessRemovedEvent(
}
}
func HumanPasswordlessRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -202,7 +200,7 @@ func NewHumanPasswordlessBeginLoginEvent(
}
}
func HumanPasswordlessBeginLoginEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessBeginLoginEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNBeginLoginEventMapper(event)
if err != nil {
return nil, err
@@ -231,7 +229,7 @@ func NewHumanPasswordlessCheckSucceededEvent(
}
}
func HumanPasswordlessCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNCheckSucceededEventMapper(event)
if err != nil {
return nil, err
@@ -260,7 +258,7 @@ func NewHumanPasswordlessCheckFailedEvent(
}
}
func HumanPasswordlessCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNCheckFailedEventMapper(event)
if err != nil {
return nil, err
@@ -277,11 +275,11 @@ type HumanPasswordlessInitCodeAddedEvent struct {
Expiry time.Duration `json:"expiry"`
}
func (e *HumanPasswordlessInitCodeAddedEvent) Data() interface{} {
func (e *HumanPasswordlessInitCodeAddedEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordlessInitCodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordlessInitCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -304,11 +302,11 @@ func NewHumanPasswordlessInitCodeAddedEvent(
}
}
func HumanPasswordlessInitCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessInitCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanPasswordlessInitCodeAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-BDf32", "unable to unmarshal human passwordless code added")
}
@@ -326,11 +324,11 @@ type HumanPasswordlessInitCodeRequestedEvent struct {
TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
}
func (e *HumanPasswordlessInitCodeRequestedEvent) Data() interface{} {
func (e *HumanPasswordlessInitCodeRequestedEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordlessInitCodeRequestedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordlessInitCodeRequestedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -362,11 +360,11 @@ func NewHumanPasswordlessInitCodeRequestedEvent(
}
}
func HumanPasswordlessInitCodeRequestedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessInitCodeRequestedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanPasswordlessInitCodeRequestedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-VGfg3", "unable to unmarshal human passwordless code delivery added")
}
@@ -379,11 +377,11 @@ type HumanPasswordlessInitCodeSentEvent struct {
ID string `json:"id"`
}
func (e *HumanPasswordlessInitCodeSentEvent) Data() interface{} {
func (e *HumanPasswordlessInitCodeSentEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordlessInitCodeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordlessInitCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -402,11 +400,11 @@ func NewHumanPasswordlessInitCodeSentEvent(
}
}
func HumanPasswordlessInitCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessInitCodeSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanPasswordlessInitCodeSentEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code sent")
}
@@ -419,11 +417,11 @@ type HumanPasswordlessInitCodeCheckFailedEvent struct {
ID string `json:"id"`
}
func (e *HumanPasswordlessInitCodeCheckFailedEvent) Data() interface{} {
func (e *HumanPasswordlessInitCodeCheckFailedEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordlessInitCodeCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordlessInitCodeCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -442,11 +440,11 @@ func NewHumanPasswordlessInitCodeCheckFailedEvent(
}
}
func HumanPasswordlessInitCodeCodeCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessInitCodeCodeCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanPasswordlessInitCodeCheckFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check failed")
}
@@ -459,11 +457,11 @@ type HumanPasswordlessInitCodeCheckSucceededEvent struct {
ID string `json:"id"`
}
func (e *HumanPasswordlessInitCodeCheckSucceededEvent) Data() interface{} {
func (e *HumanPasswordlessInitCodeCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordlessInitCodeCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordlessInitCodeCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -482,11 +480,11 @@ func NewHumanPasswordlessInitCodeCheckSucceededEvent(
}
}
func HumanPasswordlessInitCodeCodeCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordlessInitCodeCodeCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanPasswordlessInitCodeCheckSucceededEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Gtg4j", "unable to unmarshal human passwordless code check succeeded")
}

15
internal/repository/user/human_mfa_u2f.go
View File

@@ -5,7 +5,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -44,7 +43,7 @@ func NewHumanU2FAddedEvent(
}
}
func HumanU2FAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanU2FAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNAddedEventMapper(event)
if err != nil {
return nil, err
@@ -88,7 +87,7 @@ func NewHumanU2FVerifiedEvent(
}
}
func HumanU2FVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanU2FVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNVerifiedEventMapper(event)
if err != nil {
return nil, err
@@ -120,7 +119,7 @@ func NewHumanU2FSignCountChangedEvent(
}
}
func HumanU2FSignCountChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanU2FSignCountChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNSignCountChangedEventMapper(event)
if err != nil {
return nil, err
@@ -156,7 +155,7 @@ func NewHumanU2FRemovedEvent(
}
}
func HumanU2FRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanU2FRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNRemovedEventMapper(event)
if err != nil {
return nil, err
@@ -185,7 +184,7 @@ func NewHumanU2FBeginLoginEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func HumanU2FBeginLoginEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanU2FBeginLoginEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNBeginLoginEventMapper(event)
if err != nil {
return nil, err
@@ -214,7 +213,7 @@ func NewHumanU2FCheckSucceededEvent(
}
}
func HumanU2FCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanU2FCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNCheckSucceededEventMapper(event)
if err != nil {
return nil, err
@@ -243,7 +242,7 @@ func NewHumanU2FCheckFailedEvent(
}
}
func HumanU2FCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanU2FCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := HumanWebAuthNCheckFailedEventMapper(event)
if err != nil {
return nil, err

59
internal/repository/user/human_mfa_web_auth_n.go
View File

@@ -1,12 +1,9 @@
package user
import (
"encoding/json"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
type HumanWebAuthNAddedEvent struct {
@@ -17,11 +14,11 @@ type HumanWebAuthNAddedEvent struct {
RPID string `json:"rpID,omitempty"`
}
func (e *HumanWebAuthNAddedEvent) Data() interface{} {
func (e *HumanWebAuthNAddedEvent) Payload() interface{} {
return e
}
func (e *HumanWebAuthNAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanWebAuthNAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -39,11 +36,11 @@ func NewHumanWebAuthNAddedEvent(
}
}
func HumanWebAuthNAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanWebAuthNAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanWebAuthNAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-tB8sf", "unable to unmarshal human webAuthN added")
}
@@ -63,11 +60,11 @@ type HumanWebAuthNVerifiedEvent struct {
UserAgentID string `json:"userAgentID,omitempty"`
}
func (e *HumanWebAuthNVerifiedEvent) Data() interface{} {
func (e *HumanWebAuthNVerifiedEvent) Payload() interface{} {
return e
}
func (e *HumanWebAuthNVerifiedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanWebAuthNVerifiedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -95,11 +92,11 @@ func NewHumanWebAuthNVerifiedEvent(
}
}
func HumanWebAuthNVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanWebAuthNVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webauthNVerified := &HumanWebAuthNVerifiedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webauthNVerified)
err := event.Unmarshal(webauthNVerified)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-B0zDs", "unable to unmarshal human webAuthN verified")
}
@@ -113,11 +110,11 @@ type HumanWebAuthNSignCountChangedEvent struct {
SignCount uint32 `json:"signCount"`
}
func (e *HumanWebAuthNSignCountChangedEvent) Data() interface{} {
func (e *HumanWebAuthNSignCountChangedEvent) Payload() interface{} {
return e
}
func (e *HumanWebAuthNSignCountChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanWebAuthNSignCountChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -133,11 +130,11 @@ func NewHumanWebAuthNSignCountChangedEvent(
}
}
func HumanWebAuthNSignCountChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanWebAuthNSignCountChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webauthNVerified := &HumanWebAuthNSignCountChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webauthNVerified)
err := event.Unmarshal(webauthNVerified)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5Gm0s", "unable to unmarshal human webAuthN sign count")
}
@@ -151,11 +148,11 @@ type HumanWebAuthNRemovedEvent struct {
State domain.MFAState `json:"-"`
}
func (e *HumanWebAuthNRemovedEvent) Data() interface{} {
func (e *HumanWebAuthNRemovedEvent) Payload() interface{} {
return e
}
func (e *HumanWebAuthNRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanWebAuthNRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -169,11 +166,11 @@ func NewHumanWebAuthNRemovedEvent(
}
}
func HumanWebAuthNRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanWebAuthNRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webauthNVerified := &HumanWebAuthNRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webauthNVerified)
err := event.Unmarshal(webauthNVerified)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-gM9sd", "unable to unmarshal human webAuthN token removed")
}
@@ -189,11 +186,11 @@ type HumanWebAuthNBeginLoginEvent struct {
*AuthRequestInfo
}
func (e *HumanWebAuthNBeginLoginEvent) Data() interface{} {
func (e *HumanWebAuthNBeginLoginEvent) Payload() interface{} {
return e
}
func (e *HumanWebAuthNBeginLoginEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanWebAuthNBeginLoginEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -207,11 +204,11 @@ func NewHumanWebAuthNBeginLoginEvent(base *eventstore.BaseEvent, challenge strin
}
}
func HumanWebAuthNBeginLoginEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanWebAuthNBeginLoginEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanWebAuthNBeginLoginEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-rMb8x", "unable to unmarshal human webAuthN begin login")
}
@@ -223,11 +220,11 @@ type HumanWebAuthNCheckSucceededEvent struct {
*AuthRequestInfo
}
func (e *HumanWebAuthNCheckSucceededEvent) Data() interface{} {
func (e *HumanWebAuthNCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *HumanWebAuthNCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanWebAuthNCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -240,11 +237,11 @@ func NewHumanWebAuthNCheckSucceededEvent(
}
}
func HumanWebAuthNCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanWebAuthNCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanWebAuthNCheckSucceededEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-2M0fg", "unable to unmarshal human webAuthN check succeeded")
}
@@ -256,11 +253,11 @@ type HumanWebAuthNCheckFailedEvent struct {
*AuthRequestInfo
}
func (e *HumanWebAuthNCheckFailedEvent) Data() interface{} {
func (e *HumanWebAuthNCheckFailedEvent) Payload() interface{} {
return e
}
func (e *HumanWebAuthNCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanWebAuthNCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -273,11 +270,11 @@ func NewHumanWebAuthNCheckFailedEvent(
}
}
func HumanWebAuthNCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanWebAuthNCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
webAuthNAdded := &HumanWebAuthNCheckFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, webAuthNAdded)
err := event.Unmarshal(webAuthNAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-O0dse", "unable to unmarshal human webAuthN check failed")
}

50
internal/repository/user/human_password.go
View File

@@ -2,7 +2,6 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/api/http"
@@ -10,7 +9,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -36,11 +34,11 @@ type HumanPasswordChangedEvent struct {
TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
}
func (e *HumanPasswordChangedEvent) Data() interface{} {
func (e *HumanPasswordChangedEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -68,11 +66,11 @@ func NewHumanPasswordChangedEvent(
}
}
func HumanPasswordChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
humanAdded := &HumanPasswordChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, humanAdded)
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4M0sd", "unable to unmarshal human password changed")
}
@@ -91,11 +89,11 @@ type HumanPasswordCodeAddedEvent struct {
TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
}
func (e *HumanPasswordCodeAddedEvent) Data() interface{} {
func (e *HumanPasswordCodeAddedEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordCodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -137,11 +135,11 @@ func NewHumanPasswordCodeAddedEventV2(
}
}
func HumanPasswordCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
humanAdded := &HumanPasswordCodeAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, humanAdded)
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Ms90d", "unable to unmarshal human password code added")
}
@@ -153,11 +151,11 @@ type HumanPasswordCodeSentEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanPasswordCodeSentEvent) Data() interface{} {
func (e *HumanPasswordCodeSentEvent) Payload() interface{} {
return nil
}
func (e *HumanPasswordCodeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -171,7 +169,7 @@ func NewHumanPasswordCodeSentEvent(ctx context.Context, aggregate *eventstore.Ag
}
}
func HumanPasswordCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordCodeSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanPasswordCodeSentEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -181,11 +179,11 @@ type HumanPasswordChangeSentEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanPasswordChangeSentEvent) Data() interface{} {
func (e *HumanPasswordChangeSentEvent) Payload() interface{} {
return nil
}
func (e *HumanPasswordChangeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordChangeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -199,7 +197,7 @@ func NewHumanPasswordChangeSentEvent(ctx context.Context, aggregate *eventstore.
}
}
func HumanPasswordChangeSentEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordChangeSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanPasswordChangeSentEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -210,11 +208,11 @@ type HumanPasswordCheckSucceededEvent struct {
*AuthRequestInfo
}
func (e *HumanPasswordCheckSucceededEvent) Data() interface{} {
func (e *HumanPasswordCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -233,11 +231,11 @@ func NewHumanPasswordCheckSucceededEvent(
}
}
func HumanPasswordCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
humanAdded := &HumanPasswordCheckSucceededEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, humanAdded)
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M9sd", "unable to unmarshal human password check succeeded")
}
@@ -250,11 +248,11 @@ type HumanPasswordCheckFailedEvent struct {
*AuthRequestInfo
}
func (e *HumanPasswordCheckFailedEvent) Data() interface{} {
func (e *HumanPasswordCheckFailedEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -273,11 +271,11 @@ func NewHumanPasswordCheckFailedEvent(
}
}
func HumanPasswordCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPasswordCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
humanAdded := &HumanPasswordCheckFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, humanAdded)
err := event.Unmarshal(humanAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4m9fs", "unable to unmarshal human password check failed")
}
@@ -290,11 +288,11 @@ type HumanPasswordHashUpdatedEvent struct {
EncodedHash string `json:"encodedHash,omitempty"`
}
func (e *HumanPasswordHashUpdatedEvent) Data() interface{} {
func (e *HumanPasswordHashUpdatedEvent) Payload() interface{} {
return e
}
func (e *HumanPasswordHashUpdatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPasswordHashUpdatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}

42
internal/repository/user/human_phone.go
View File

@@ -2,7 +2,6 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/api/http"
@@ -10,7 +9,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -29,11 +27,11 @@ type HumanPhoneChangedEvent struct {
PhoneNumber domain.PhoneNumber `json:"phone,omitempty"`
}
func (e *HumanPhoneChangedEvent) Data() interface{} {
func (e *HumanPhoneChangedEvent) Payload() interface{} {
return e
}
func (e *HumanPhoneChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPhoneChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -48,11 +46,11 @@ func NewHumanPhoneChangedEvent(ctx context.Context, aggregate *eventstore.Aggreg
}
}
func HumanPhoneChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPhoneChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
phoneChangedEvent := &HumanPhoneChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, phoneChangedEvent)
err := event.Unmarshal(phoneChangedEvent)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human phone changed")
}
@@ -64,11 +62,11 @@ type HumanPhoneRemovedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanPhoneRemovedEvent) Data() interface{} {
func (e *HumanPhoneRemovedEvent) Payload() interface{} {
return nil
}
func (e *HumanPhoneRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPhoneRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -82,7 +80,7 @@ func NewHumanPhoneRemovedEvent(ctx context.Context, aggregate *eventstore.Aggreg
}
}
func HumanPhoneRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPhoneRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanPhoneRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -94,11 +92,11 @@ type HumanPhoneVerifiedEvent struct {
IsPhoneVerified bool `json:"-"`
}
func (e *HumanPhoneVerifiedEvent) Data() interface{} {
func (e *HumanPhoneVerifiedEvent) Payload() interface{} {
return nil
}
func (e *HumanPhoneVerifiedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPhoneVerifiedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -112,7 +110,7 @@ func NewHumanPhoneVerifiedEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func HumanPhoneVerifiedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPhoneVerifiedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanPhoneVerifiedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
IsPhoneVerified: true,
@@ -123,11 +121,11 @@ type HumanPhoneVerificationFailedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanPhoneVerificationFailedEvent) Data() interface{} {
func (e *HumanPhoneVerificationFailedEvent) Payload() interface{} {
return nil
}
func (e *HumanPhoneVerificationFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPhoneVerificationFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -141,7 +139,7 @@ func NewHumanPhoneVerificationFailedEvent(ctx context.Context, aggregate *events
}
}
func HumanPhoneVerificationFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPhoneVerificationFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanPhoneVerificationFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -156,11 +154,11 @@ type HumanPhoneCodeAddedEvent struct {
TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
}
func (e *HumanPhoneCodeAddedEvent) Data() interface{} {
func (e *HumanPhoneCodeAddedEvent) Payload() interface{} {
return e
}
func (e *HumanPhoneCodeAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPhoneCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -196,11 +194,11 @@ func NewHumanPhoneCodeAddedEventV2(
}
}
func HumanPhoneCodeAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPhoneCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
codeAdded := &HumanPhoneCodeAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, codeAdded)
err := event.Unmarshal(codeAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-6Ms9d", "unable to unmarshal human phone code added")
}
@@ -212,11 +210,11 @@ type HumanPhoneCodeSentEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *HumanPhoneCodeSentEvent) Data() interface{} {
func (e *HumanPhoneCodeSentEvent) Payload() interface{} {
return e
}
func (e *HumanPhoneCodeSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanPhoneCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -230,7 +228,7 @@ func NewHumanPhoneCodeSentEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func HumanPhoneCodeSentEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanPhoneCodeSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &HumanPhoneCodeSentEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil

13
internal/repository/user/human_profile.go
View File

@@ -2,13 +2,10 @@ package user
import (
"context"
"encoding/json"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
"golang.org/x/text/language"
)
@@ -28,11 +25,11 @@ type HumanProfileChangedEvent struct {
Gender *domain.Gender `json:"gender,omitempty"`
}
func (e *HumanProfileChangedEvent) Data() interface{} {
func (e *HumanProfileChangedEvent) Payload() interface{} {
return e
}
func (e *HumanProfileChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanProfileChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -95,11 +92,11 @@ func ChangeGender(gender domain.Gender) func(event *HumanProfileChangedEvent) {
}
}
func HumanProfileChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanProfileChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
profileChanged := &HumanProfileChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, profileChanged)
err := event.Unmarshal(profileChanged)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5M0pd", "unable to unmarshal human profile changed")
}

29
internal/repository/user/human_refresh_token.go
View File

@@ -2,13 +2,10 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
)
const (
@@ -33,11 +30,11 @@ type HumanRefreshTokenAddedEvent struct {
PreferredLanguage string `json:"preferredLanguage"`
}
func (e *HumanRefreshTokenAddedEvent) Data() interface{} {
func (e *HumanRefreshTokenAddedEvent) Payload() interface{} {
return e
}
func (e *HumanRefreshTokenAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanRefreshTokenAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -78,11 +75,11 @@ func NewHumanRefreshTokenAddedEvent(
}
}
func HumanRefreshTokenAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanRefreshTokenAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
refreshTokenAdded := &HumanRefreshTokenAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, refreshTokenAdded)
err := event.Unmarshal(refreshTokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-DGr14", "unable to unmarshal refresh token added")
}
@@ -98,11 +95,11 @@ type HumanRefreshTokenRenewedEvent struct {
IdleExpiration time.Duration `json:"idleExpiration"`
}
func (e *HumanRefreshTokenRenewedEvent) Data() interface{} {
func (e *HumanRefreshTokenRenewedEvent) Payload() interface{} {
return e
}
func (e *HumanRefreshTokenRenewedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanRefreshTokenRenewedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -129,11 +126,11 @@ func NewHumanRefreshTokenRenewedEvent(
}
}
func HumanRefreshTokenRenewedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanRefreshTokenRenewedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
tokenAdded := &HumanRefreshTokenRenewedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, tokenAdded)
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-GBt21", "unable to unmarshal refresh token renewed")
}
@@ -147,11 +144,11 @@ type HumanRefreshTokenRemovedEvent struct {
TokenID string `json:"tokenId"`
}
func (e *HumanRefreshTokenRemovedEvent) Data() interface{} {
func (e *HumanRefreshTokenRemovedEvent) Payload() interface{} {
return e
}
func (e *HumanRefreshTokenRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *HumanRefreshTokenRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -174,11 +171,11 @@ func NewHumanRefreshTokenRemovedEvent(
}
}
func HumanRefreshTokenRemovedEventEventMapper(event *repository.Event) (eventstore.Event, error) {
func HumanRefreshTokenRemovedEventEventMapper(event eventstore.Event) (eventstore.Event, error) {
tokenAdded := &HumanRefreshTokenRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, tokenAdded)
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Dggs2", "unable to unmarshal refresh token removed")
}

23
internal/repository/user/machine.go
View File

@@ -2,13 +2,10 @@ package user
import (
"context"
"encoding/json"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/eventstore"
)
const (
@@ -28,12 +25,12 @@ type MachineAddedEvent struct {
AccessTokenType domain.OIDCTokenType `json:"accessTokenType,omitempty"`
}
func (e *MachineAddedEvent) Data() interface{} {
func (e *MachineAddedEvent) Payload() interface{} {
return e
}
func (e *MachineAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
func (e *MachineAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
}
func NewMachineAddedEvent(
@@ -59,11 +56,11 @@ func NewMachineAddedEvent(
}
}
func MachineAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
machineAdded := &MachineAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, machineAdded)
err := event.Unmarshal(machineAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-tMv9s", "unable to unmarshal machine added")
}
@@ -79,11 +76,11 @@ type MachineChangedEvent struct {
AccessTokenType *domain.OIDCTokenType `json:"accessTokenType,omitempty"`
}
func (e *MachineChangedEvent) Data() interface{} {
func (e *MachineChangedEvent) Payload() interface{} {
return e
}
func (e *MachineChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *MachineChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -128,11 +125,11 @@ func ChangeAccessTokenType(accessTokenType domain.OIDCTokenType) func(event *Mac
}
}
func MachineChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
machineChanged := &MachineChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, machineChanged)
err := event.Unmarshal(machineChanged)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4M9ds", "unable to unmarshal machine changed")
}

17
internal/repository/user/machine_key.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -26,11 +25,11 @@ type MachineKeyAddedEvent struct {
PublicKey []byte `json:"publicKey,omitempty"`
}
func (e *MachineKeyAddedEvent) Data() interface{} {
func (e *MachineKeyAddedEvent) Payload() interface{} {
return e
}
func (e *MachineKeyAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *MachineKeyAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -55,11 +54,11 @@ func NewMachineKeyAddedEvent(
}
}
func MachineKeyAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineKeyAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
machineKeyAdded := &MachineKeyAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, machineKeyAdded)
err := event.Unmarshal(machineKeyAdded)
if err != nil {
//first events had wrong payload.
// the keys were removed later, that's why we ignore them here.
@@ -78,11 +77,11 @@ type MachineKeyRemovedEvent struct {
KeyID string `json:"keyId,omitempty"`
}
func (e *MachineKeyRemovedEvent) Data() interface{} {
func (e *MachineKeyRemovedEvent) Payload() interface{} {
return e
}
func (e *MachineKeyRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *MachineKeyRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -101,11 +100,11 @@ func NewMachineKeyRemovedEvent(
}
}
func MachineKeyRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineKeyRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
machineRemoved := &MachineKeyRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, machineRemoved)
err := event.Unmarshal(machineRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-5Gm9s", "unable to unmarshal machine key removed")
}

34
internal/repository/user/machine_secret.go
View File

@@ -2,12 +2,10 @@ package user
import (
"context"
"encoding/json"
"github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -24,11 +22,11 @@ type MachineSecretSetEvent struct {
ClientSecret *crypto.CryptoValue `json:"clientSecret,omitempty"`
}
func (e *MachineSecretSetEvent) Data() interface{} {
func (e *MachineSecretSetEvent) Payload() interface{} {
return e
}
func (e *MachineSecretSetEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *MachineSecretSetEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -47,11 +45,11 @@ func NewMachineSecretSetEvent(
}
}
func MachineSecretSetEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineSecretSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
credentialsSet := &MachineSecretSetEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, credentialsSet)
err := event.Unmarshal(credentialsSet)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-lopbqu", "unable to unmarshal machine secret set")
}
@@ -63,11 +61,11 @@ type MachineSecretRemovedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *MachineSecretRemovedEvent) Data() interface{} {
func (e *MachineSecretRemovedEvent) Payload() interface{} {
return e
}
func (e *MachineSecretRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *MachineSecretRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -84,11 +82,11 @@ func NewMachineSecretRemovedEvent(
}
}
func MachineSecretRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineSecretRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
credentialsRemoved := &MachineSecretRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, credentialsRemoved)
err := event.Unmarshal(credentialsRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-quox9j2", "unable to unmarshal machine secret removed")
}
@@ -100,11 +98,11 @@ type MachineSecretCheckSucceededEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *MachineSecretCheckSucceededEvent) Data() interface{} {
func (e *MachineSecretCheckSucceededEvent) Payload() interface{} {
return e
}
func (e *MachineSecretCheckSucceededEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *MachineSecretCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -121,11 +119,11 @@ func NewMachineSecretCheckSucceededEvent(
}
}
func MachineSecretCheckSucceededEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineSecretCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
check := &MachineSecretCheckSucceededEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, check)
err := event.Unmarshal(check)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-x002n1p", "unable to unmarshal machine secret check succeeded")
}
@@ -137,11 +135,11 @@ type MachineSecretCheckFailedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *MachineSecretCheckFailedEvent) Data() interface{} {
func (e *MachineSecretCheckFailedEvent) Payload() interface{} {
return e
}
func (e *MachineSecretCheckFailedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *MachineSecretCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -158,11 +156,11 @@ func NewMachineSecretCheckFailedEvent(
}
}
func MachineSecretCheckFailedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MachineSecretCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
check := &MachineSecretCheckFailedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, check)
err := event.Unmarshal(check)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-x7901b1l", "unable to unmarshal machine secret check failed")
}

7
internal/repository/user/metadata.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
"github.com/zitadel/zitadel/internal/repository/metadata"
)
@@ -30,7 +29,7 @@ func NewMetadataSetEvent(ctx context.Context, aggregate *eventstore.Aggregate, k
}
}
func MetadataSetEventMapper(event *repository.Event) (eventstore.Event, error) {
func MetadataSetEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := metadata.SetEventMapper(event)
if err != nil {
return nil, err
@@ -54,7 +53,7 @@ func NewMetadataRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregat
}
}
func MetadataRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func MetadataRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := metadata.RemovedEventMapper(event)
if err != nil {
return nil, err
@@ -78,7 +77,7 @@ func NewMetadataRemovedAllEvent(ctx context.Context, aggregate *eventstore.Aggre
}
}
func MetadataRemovedAllEventMapper(event *repository.Event) (eventstore.Event, error) {
func MetadataRemovedAllEventMapper(event eventstore.Event) (eventstore.Event, error) {
e, err := metadata.RemovedAllEventMapper(event)
if err != nil {
return nil, err

18
internal/repository/user/personal_access_token.go
View File

@@ -2,12 +2,10 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -24,11 +22,11 @@ type PersonalAccessTokenAddedEvent struct {
Scopes []string `json:"scopes"`
}
func (e *PersonalAccessTokenAddedEvent) Data() interface{} {
func (e *PersonalAccessTokenAddedEvent) Payload() interface{} {
return e
}
func (e *PersonalAccessTokenAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *PersonalAccessTokenAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -51,11 +49,11 @@ func NewPersonalAccessTokenAddedEvent(
}
}
func PersonalAccessTokenAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PersonalAccessTokenAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
tokenAdded := &PersonalAccessTokenAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, tokenAdded)
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Dbges", "unable to unmarshal token added")
}
@@ -69,11 +67,11 @@ type PersonalAccessTokenRemovedEvent struct {
TokenID string `json:"tokenId"`
}
func (e *PersonalAccessTokenRemovedEvent) Data() interface{} {
func (e *PersonalAccessTokenRemovedEvent) Payload() interface{} {
return e
}
func (e *PersonalAccessTokenRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *PersonalAccessTokenRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -92,11 +90,11 @@ func NewPersonalAccessTokenRemovedEvent(
}
}
func PersonalAccessTokenRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func PersonalAccessTokenRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
tokenRemoved := &PersonalAccessTokenRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, tokenRemoved)
err := event.Unmarshal(tokenRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-Dbneg", "unable to unmarshal token removed")
}

82
internal/repository/user/user.go
View File

@@ -2,14 +2,12 @@ package user
import (
"context"
"encoding/json"
"time"
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository"
)
const (
@@ -27,7 +25,7 @@ const (
UserUserNameChangedType = userEventTypePrefix + "username.changed"
)
func NewAddUsernameUniqueConstraint(userName, resourceOwner string, userLoginMustBeDomain bool) *eventstore.EventUniqueConstraint {
func NewAddUsernameUniqueConstraint(userName, resourceOwner string, userLoginMustBeDomain bool) *eventstore.UniqueConstraint {
uniqueUserName := userName
if userLoginMustBeDomain {
uniqueUserName = userName + resourceOwner
@@ -38,12 +36,12 @@ func NewAddUsernameUniqueConstraint(userName, resourceOwner string, userLoginMus
"Errors.User.AlreadyExists")
}
func NewRemoveUsernameUniqueConstraint(userName, resourceOwner string, userLoginMustBeDomain bool) *eventstore.EventUniqueConstraint {
func NewRemoveUsernameUniqueConstraint(userName, resourceOwner string, userLoginMustBeDomain bool) *eventstore.UniqueConstraint {
uniqueUserName := userName
if userLoginMustBeDomain {
uniqueUserName = userName + resourceOwner
}
return eventstore.NewRemoveEventUniqueConstraint(
return eventstore.NewRemoveUniqueConstraint(
UniqueUsername,
uniqueUserName)
}
@@ -52,11 +50,11 @@ type UserLockedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *UserLockedEvent) Data() interface{} {
func (e *UserLockedEvent) Payload() interface{} {
return nil
}
func (e *UserLockedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserLockedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -70,7 +68,7 @@ func NewUserLockedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *U
}
}
func UserLockedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserLockedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &UserLockedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -80,11 +78,11 @@ type UserUnlockedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *UserUnlockedEvent) Data() interface{} {
func (e *UserUnlockedEvent) Payload() interface{} {
return nil
}
func (e *UserUnlockedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserUnlockedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -98,7 +96,7 @@ func NewUserUnlockedEvent(ctx context.Context, aggregate *eventstore.Aggregate)
}
}
func UserUnlockedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserUnlockedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &UserUnlockedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -108,11 +106,11 @@ type UserDeactivatedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *UserDeactivatedEvent) Data() interface{} {
func (e *UserDeactivatedEvent) Payload() interface{} {
return nil
}
func (e *UserDeactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserDeactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -126,7 +124,7 @@ func NewUserDeactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregat
}
}
func UserDeactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserDeactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &UserDeactivatedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -136,11 +134,11 @@ type UserReactivatedEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *UserReactivatedEvent) Data() interface{} {
func (e *UserReactivatedEvent) Payload() interface{} {
return nil
}
func (e *UserReactivatedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserReactivatedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -154,7 +152,7 @@ func NewUserReactivatedEvent(ctx context.Context, aggregate *eventstore.Aggregat
}
}
func UserReactivatedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserReactivatedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &UserReactivatedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -168,12 +166,12 @@ type UserRemovedEvent struct {
loginMustBeDomain bool
}
func (e *UserRemovedEvent) Data() interface{} {
func (e *UserRemovedEvent) Payload() interface{} {
return nil
}
func (e *UserRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
events := make([]*eventstore.EventUniqueConstraint, 0)
func (e *UserRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
events := make([]*eventstore.UniqueConstraint, 0)
if e.userName != "" {
events = append(events, NewRemoveUsernameUniqueConstraint(e.userName, e.Aggregate().ResourceOwner, e.loginMustBeDomain))
}
@@ -202,7 +200,7 @@ func NewUserRemovedEvent(
}
}
func UserRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &UserRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -221,11 +219,11 @@ type UserTokenAddedEvent struct {
PreferredLanguage string `json:"preferredLanguage"`
}
func (e *UserTokenAddedEvent) Data() interface{} {
func (e *UserTokenAddedEvent) Payload() interface{} {
return e
}
func (e *UserTokenAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserTokenAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -258,11 +256,11 @@ func NewUserTokenAddedEvent(
}
}
func UserTokenAddedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserTokenAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
tokenAdded := &UserTokenAddedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, tokenAdded)
err := event.Unmarshal(tokenAdded)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added")
}
@@ -276,11 +274,11 @@ type UserTokenRemovedEvent struct {
TokenID string `json:"tokenId"`
}
func (e *UserTokenRemovedEvent) Data() interface{} {
func (e *UserTokenRemovedEvent) Payload() interface{} {
return e
}
func (e *UserTokenRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *UserTokenRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -299,11 +297,11 @@ func NewUserTokenRemovedEvent(
}
}
func UserTokenRemovedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UserTokenRemovedEventMapper(event eventstore.Event) (eventstore.Event, error) {
tokenRemoved := &UserTokenRemovedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, tokenRemoved)
err := event.Unmarshal(tokenRemoved)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-7M9sd", "unable to unmarshal token added")
}
@@ -320,12 +318,12 @@ type DomainClaimedEvent struct {
userLoginMustBeDomain bool
}
func (e *DomainClaimedEvent) Data() interface{} {
func (e *DomainClaimedEvent) Payload() interface{} {
return e
}
func (e *DomainClaimedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{
func (e *DomainClaimedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{
NewRemoveUsernameUniqueConstraint(e.oldUserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain),
NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain),
}
@@ -355,11 +353,11 @@ func NewDomainClaimedEvent(
}
}
func DomainClaimedEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainClaimedEventMapper(event eventstore.Event) (eventstore.Event, error) {
domainClaimed := &DomainClaimedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, domainClaimed)
err := event.Unmarshal(domainClaimed)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-aR8jc", "unable to unmarshal domain claimed")
}
@@ -371,11 +369,11 @@ type DomainClaimedSentEvent struct {
eventstore.BaseEvent `json:"-"`
}
func (e *DomainClaimedSentEvent) Data() interface{} {
func (e *DomainClaimedSentEvent) Payload() interface{} {
return nil
}
func (e *DomainClaimedSentEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
func (e *DomainClaimedSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return nil
}
@@ -392,7 +390,7 @@ func NewDomainClaimedSentEvent(
}
}
func DomainClaimedSentEventMapper(event *repository.Event) (eventstore.Event, error) {
func DomainClaimedSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
return &DomainClaimedSentEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}, nil
@@ -407,12 +405,12 @@ type UsernameChangedEvent struct {
oldUserLoginMustBeDomain bool
}
func (e *UsernameChangedEvent) Data() interface{} {
func (e *UsernameChangedEvent) Payload() interface{} {
return e
}
func (e *UsernameChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
return []*eventstore.EventUniqueConstraint{
func (e *UsernameChangedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
return []*eventstore.UniqueConstraint{
NewRemoveUsernameUniqueConstraint(e.oldUserName, e.Aggregate().ResourceOwner, e.oldUserLoginMustBeDomain),
NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain),
}
@@ -453,11 +451,11 @@ func UsernameChangedEventWithPolicyChange() UsernameChangedEventOption {
}
}
func UsernameChangedEventMapper(event *repository.Event) (eventstore.Event, error) {
func UsernameChangedEventMapper(event eventstore.Event) (eventstore.Event, error) {
domainClaimed := &UsernameChangedEvent{
BaseEvent: *eventstore.BaseEventFromRepo(event),
}
err := json.Unmarshal(event.Data, domainClaimed)
err := event.Unmarshal(domainClaimed)
if err != nil {
return nil, errors.ThrowInternal(err, "USER-4Bm9s", "unable to unmarshal username changed")
}