mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-15 11:48:36 +00:00
b8ba7bd5ba
# Which Problems Are Solved Actions v2 is not a feature flag anymore, include functionality on executions is not used and json tags of proto messages are handled incorrectly. # How the Problems Are Solved - Remove actions from the feature flags on system and instance level - Remove include type on executions, only in the API, later maybe in the handling logic as well - Use protojson in request and response handling of actions v2 # Additional Changes - Correct integration tests for request and response handling - Use json.RawMessage for events, so that the event payload is not base64 encoded - Added separate context for async webhook calls, that executions are not cancelled when called async # Additional Context Related to #9759 Closes #9710 --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
72 lines
2.0 KiB
Go
72 lines
2.0 KiB
Go
package execution
|
|
|
|
import (
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
)
|
|
|
|
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 (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
|
|
}
|