This commit is contained in:
Elio Bischof
2023-09-27 12:28:48 +02:00
parent 8d7d95a084
commit c61cdd5e42
6 changed files with 12 additions and 18 deletions

View File

@@ -3,9 +3,9 @@ package session
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/zitadel/zitadel/internal/api/http"
"time" "time"
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/errors"
@@ -414,7 +414,7 @@ type OTPEmailChallengedEvent struct {
Expiry time.Duration `json:"expiry"` Expiry time.Duration `json:"expiry"`
ReturnCode bool `json:"returnCode,omitempty"` ReturnCode bool `json:"returnCode,omitempty"`
URLTmpl string `json:"urlTmpl,omitempty"` URLTmpl string `json:"urlTmpl,omitempty"`
TriggeredAtOrigin string `json:"trigger_origin,omitempty"` TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
} }
func (e *OTPEmailChallengedEvent) Data() interface{} { func (e *OTPEmailChallengedEvent) Data() interface{} {

View File

@@ -5,10 +5,9 @@ import (
"encoding/json" "encoding/json"
"time" "time"
"github.com/zitadel/zitadel/internal/api/http"
"golang.org/x/text/language" "golang.org/x/text/language"
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/errors"
@@ -246,7 +245,7 @@ type HumanInitialCodeAddedEvent struct {
eventstore.BaseEvent `json:"-"` eventstore.BaseEvent `json:"-"`
Code *crypto.CryptoValue `json:"code,omitempty"` Code *crypto.CryptoValue `json:"code,omitempty"`
Expiry time.Duration `json:"expiry,omitempty"` Expiry time.Duration `json:"expiry,omitempty"`
TriggeredAtOrigin string `json:"trigger_origin,omitempty"` TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
} }
func (e *HumanInitialCodeAddedEvent) Data() interface{} { func (e *HumanInitialCodeAddedEvent) Data() interface{} {

View File

@@ -3,9 +3,9 @@ package user
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"github.com/zitadel/zitadel/internal/api/http"
"time" "time"
"github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/errors"
@@ -127,7 +127,7 @@ type HumanEmailCodeAddedEvent struct {
Expiry time.Duration `json:"expiry,omitempty"` Expiry time.Duration `json:"expiry,omitempty"`
URLTemplate string `json:"url_template,omitempty"` URLTemplate string `json:"url_template,omitempty"`
CodeReturned bool `json:"code_returned,omitempty"` CodeReturned bool `json:"code_returned,omitempty"`
TriggeredAtOrigin string `json:"trigger_origin,omitempty"` TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
} }
func (e *HumanEmailCodeAddedEvent) Data() interface{} { func (e *HumanEmailCodeAddedEvent) Data() interface{} {

View File

@@ -6,7 +6,6 @@ import (
"time" "time"
"github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/errors"
@@ -324,7 +323,7 @@ type HumanPasswordlessInitCodeRequestedEvent struct {
Expiry time.Duration `json:"expiry"` Expiry time.Duration `json:"expiry"`
URLTemplate string `json:"url_template,omitempty"` URLTemplate string `json:"url_template,omitempty"`
CodeReturned bool `json:"code_returned,omitempty"` CodeReturned bool `json:"code_returned,omitempty"`
TriggeredAtOrigin string `json:"trigger_origin,omitempty"` TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
} }
func (e *HumanPasswordlessInitCodeRequestedEvent) Data() interface{} { func (e *HumanPasswordlessInitCodeRequestedEvent) Data() interface{} {

View File

@@ -6,12 +6,10 @@ import (
"time" "time"
"github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/crypto" "github.com/zitadel/zitadel/internal/crypto"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository" "github.com/zitadel/zitadel/internal/eventstore/repository"
) )
@@ -35,7 +33,7 @@ type HumanPasswordChangedEvent struct {
EncodedHash string `json:"encodedHash,omitempty"` EncodedHash string `json:"encodedHash,omitempty"`
ChangeRequired bool `json:"changeRequired"` ChangeRequired bool `json:"changeRequired"`
UserAgentID string `json:"userAgentID,omitempty"` UserAgentID string `json:"userAgentID,omitempty"`
TriggeredAtOrigin string `json:"trigger_origin,omitempty"` TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
} }
func (e *HumanPasswordChangedEvent) Data() interface{} { func (e *HumanPasswordChangedEvent) Data() interface{} {
@@ -90,7 +88,7 @@ type HumanPasswordCodeAddedEvent struct {
NotificationType domain.NotificationType `json:"notificationType,omitempty"` NotificationType domain.NotificationType `json:"notificationType,omitempty"`
URLTemplate string `json:"url_template,omitempty"` URLTemplate string `json:"url_template,omitempty"`
CodeReturned bool `json:"code_returned,omitempty"` CodeReturned bool `json:"code_returned,omitempty"`
TriggeredAtOrigin string `json:"trigger_origin,omitempty"` TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
} }
func (e *HumanPasswordCodeAddedEvent) Data() interface{} { func (e *HumanPasswordCodeAddedEvent) Data() interface{} {

View File

@@ -6,11 +6,9 @@ import (
"time" "time"
"github.com/zitadel/zitadel/internal/api/http" "github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/eventstore/repository" "github.com/zitadel/zitadel/internal/eventstore/repository"
) )
@@ -317,7 +315,7 @@ type DomainClaimedEvent struct {
eventstore.BaseEvent `json:"-"` eventstore.BaseEvent `json:"-"`
UserName string `json:"userName"` UserName string `json:"userName"`
TriggeredAtOrigin string `json:"trigger_origin,omitempty"` TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
oldUserName string oldUserName string
userLoginMustBeDomain bool userLoginMustBeDomain bool
} }