diff --git a/internal/repository/session/session.go b/internal/repository/session/session.go index 914282be84..e9ebb9a881 100644 --- a/internal/repository/session/session.go +++ b/internal/repository/session/session.go @@ -3,9 +3,9 @@ package session import ( "context" "encoding/json" - "github.com/zitadel/zitadel/internal/api/http" "time" + "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/errors" @@ -414,7 +414,7 @@ type OTPEmailChallengedEvent struct { Expiry time.Duration `json:"expiry"` ReturnCode bool `json:"returnCode,omitempty"` URLTmpl string `json:"urlTmpl,omitempty"` - TriggeredAtOrigin string `json:"trigger_origin,omitempty"` + TriggeredAtOrigin string `json:"triggerOrigin,omitempty"` } func (e *OTPEmailChallengedEvent) Data() interface{} { diff --git a/internal/repository/user/human.go b/internal/repository/user/human.go index 38e1b3ea6e..aeaf242103 100644 --- a/internal/repository/user/human.go +++ b/internal/repository/user/human.go @@ -5,10 +5,9 @@ import ( "encoding/json" "time" - "github.com/zitadel/zitadel/internal/api/http" - "golang.org/x/text/language" + "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/errors" @@ -246,7 +245,7 @@ type HumanInitialCodeAddedEvent struct { eventstore.BaseEvent `json:"-"` Code *crypto.CryptoValue `json:"code,omitempty"` Expiry time.Duration `json:"expiry,omitempty"` - TriggeredAtOrigin string `json:"trigger_origin,omitempty"` + TriggeredAtOrigin string `json:"triggerOrigin,omitempty"` } func (e *HumanInitialCodeAddedEvent) Data() interface{} { diff --git a/internal/repository/user/human_email.go b/internal/repository/user/human_email.go index d0f0581e0b..7c92687c49 100644 --- a/internal/repository/user/human_email.go +++ b/internal/repository/user/human_email.go @@ -3,9 +3,9 @@ package user import ( "context" "encoding/json" - "github.com/zitadel/zitadel/internal/api/http" "time" + "github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/errors" @@ -127,7 +127,7 @@ type HumanEmailCodeAddedEvent struct { Expiry time.Duration `json:"expiry,omitempty"` URLTemplate string `json:"url_template,omitempty"` CodeReturned bool `json:"code_returned,omitempty"` - TriggeredAtOrigin string `json:"trigger_origin,omitempty"` + TriggeredAtOrigin string `json:"triggerOrigin,omitempty"` } func (e *HumanEmailCodeAddedEvent) Data() interface{} { diff --git a/internal/repository/user/human_mfa_passwordless.go b/internal/repository/user/human_mfa_passwordless.go index a188ccb9ec..8a1658ea00 100644 --- a/internal/repository/user/human_mfa_passwordless.go +++ b/internal/repository/user/human_mfa_passwordless.go @@ -6,7 +6,6 @@ import ( "time" "github.com/zitadel/zitadel/internal/api/http" - "github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/errors" @@ -324,7 +323,7 @@ type HumanPasswordlessInitCodeRequestedEvent struct { Expiry time.Duration `json:"expiry"` URLTemplate string `json:"url_template,omitempty"` CodeReturned bool `json:"code_returned,omitempty"` - TriggeredAtOrigin string `json:"trigger_origin,omitempty"` + TriggeredAtOrigin string `json:"triggerOrigin,omitempty"` } func (e *HumanPasswordlessInitCodeRequestedEvent) Data() interface{} { diff --git a/internal/repository/user/human_password.go b/internal/repository/user/human_password.go index a7f2a9d039..486adbf35b 100644 --- a/internal/repository/user/human_password.go +++ b/internal/repository/user/human_password.go @@ -6,12 +6,10 @@ import ( "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/domain" "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/repository" ) @@ -35,7 +33,7 @@ type HumanPasswordChangedEvent struct { EncodedHash string `json:"encodedHash,omitempty"` ChangeRequired bool `json:"changeRequired"` UserAgentID string `json:"userAgentID,omitempty"` - TriggeredAtOrigin string `json:"trigger_origin,omitempty"` + TriggeredAtOrigin string `json:"triggerOrigin,omitempty"` } func (e *HumanPasswordChangedEvent) Data() interface{} { @@ -90,7 +88,7 @@ type HumanPasswordCodeAddedEvent struct { NotificationType domain.NotificationType `json:"notificationType,omitempty"` URLTemplate string `json:"url_template,omitempty"` CodeReturned bool `json:"code_returned,omitempty"` - TriggeredAtOrigin string `json:"trigger_origin,omitempty"` + TriggeredAtOrigin string `json:"triggerOrigin,omitempty"` } func (e *HumanPasswordCodeAddedEvent) Data() interface{} { diff --git a/internal/repository/user/user.go b/internal/repository/user/user.go index 5603295996..3a29dbb066 100644 --- a/internal/repository/user/user.go +++ b/internal/repository/user/user.go @@ -6,11 +6,9 @@ import ( "time" "github.com/zitadel/zitadel/internal/api/http" - "github.com/zitadel/zitadel/internal/domain" - "github.com/zitadel/zitadel/internal/eventstore" - "github.com/zitadel/zitadel/internal/errors" + "github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore/repository" ) @@ -317,7 +315,7 @@ type DomainClaimedEvent struct { eventstore.BaseEvent `json:"-"` UserName string `json:"userName"` - TriggeredAtOrigin string `json:"trigger_origin,omitempty"` + TriggeredAtOrigin string `json:"triggerOrigin,omitempty"` oldUserName string userLoginMustBeDomain bool }