mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-06 03:02:07 +00:00
1d0712b7eb
# Which Problems Are Solved
It was noticed that on actions v2 when subscribing to events, the
webhook would always receive an empty `event_payload`:
```
{
"aggregateID": "336494809936035843",
"aggregateType": "user",
"resourceOwner": "336392597046099971",
"instanceID": "336392597046034435",
"version": "v2",
"sequence": 1,
"event_type": "user.human.added",
"created_at": "2025-09-05T08:55:36.156333Z",
"userID": "336392597046755331",
"event_payload":
{}
}
```
The problem was due to using `json.Marshal` on the `Event` interface,
where the underlying `BaseEvent` prevents the data to be marshalled:
131f70db34/internal/eventstore/event_base.go (L38)
# How the Problems Are Solved
The `Event`s `Unmarshal` function is used with a `json.RawMessage`.
# Additional Changes
none
# Additional Context
- backport for v4.x
- relates to https://github.com/zitadel/zitadel/pull/10651
- relates to https://github.com/zitadel/zitadel/pull/10564
96 lines
2.7 KiB
Go
96 lines
2.7 KiB
Go
package execution
|
|
|
|
import (
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/execution/target"
|
|
)
|
|
|
|
const (
|
|
QueueName = "execution"
|
|
)
|
|
|
|
type Request struct {
|
|
Aggregate *eventstore.Aggregate `json:"aggregate"`
|
|
Sequence uint64 `json:"sequence"`
|
|
EventType eventstore.EventType `json:"eventType"`
|
|
CreatedAt time.Time `json:"createdAt"`
|
|
UserID string `json:"userID"`
|
|
EventData []byte `json:"eventData"`
|
|
TargetsData []byte `json:"targetsData"`
|
|
}
|
|
|
|
func NewRequest(e eventstore.Event, targets []target.Target) (*Request, error) {
|
|
targetsData, err := json.Marshal(targets)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// The underlying BaseEvent omits the data when using json.Marshal so we have to unmarshal it manually.
|
|
var eventData json.RawMessage
|
|
err = e.Unmarshal(&eventData)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &Request{
|
|
Aggregate: e.Aggregate(),
|
|
Sequence: e.Sequence(),
|
|
EventType: e.Type(),
|
|
CreatedAt: e.CreatedAt(),
|
|
UserID: e.Creator(),
|
|
EventData: eventData,
|
|
TargetsData: targetsData,
|
|
}, nil
|
|
}
|
|
|
|
func (e *Request) Kind() string {
|
|
return "execution_request"
|
|
}
|
|
|
|
func ContextInfoFromRequest(e *Request) *ContextInfoEvent {
|
|
return &ContextInfoEvent{
|
|
AggregateID: e.Aggregate.ID,
|
|
AggregateType: string(e.Aggregate.Type),
|
|
ResourceOwner: e.Aggregate.ResourceOwner,
|
|
InstanceID: e.Aggregate.InstanceID,
|
|
Version: string(e.Aggregate.Version),
|
|
Sequence: e.Sequence,
|
|
EventType: string(e.EventType),
|
|
CreatedAt: e.CreatedAt.Format(time.RFC3339Nano),
|
|
UserID: e.UserID,
|
|
EventPayload: e.EventData,
|
|
}
|
|
}
|
|
|
|
type ContextInfoEvent struct {
|
|
AggregateID string `json:"aggregateID,omitempty"`
|
|
AggregateType string `json:"aggregateType,omitempty"`
|
|
ResourceOwner string `json:"resourceOwner,omitempty"`
|
|
InstanceID string `json:"instanceID,omitempty"`
|
|
Version string `json:"version,omitempty"`
|
|
Sequence uint64 `json:"sequence,omitempty"`
|
|
EventType string `json:"event_type,omitempty"`
|
|
CreatedAt string `json:"created_at,omitempty"`
|
|
UserID string `json:"userID,omitempty"`
|
|
EventPayload json.RawMessage `json:"event_payload,omitempty"`
|
|
}
|
|
|
|
func (c *ContextInfoEvent) GetHTTPRequestBody() []byte {
|
|
data, err := json.Marshal(c)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
return data
|
|
}
|
|
|
|
func (c *ContextInfoEvent) SetHTTPResponseBody(resp []byte) error {
|
|
// response is irrelevant and will not be unmarshaled
|
|
return nil
|
|
}
|
|
|
|
func (c *ContextInfoEvent) GetContent() any {
|
|
return c.EventPayload
|
|
}
|