mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 20:37:30 +00:00

# Which Problems Are Solved The current maintained gRPC server in combination with a REST (grpc) gateway is getting harder and harder to maintain. Additionally, there have been and still are issues with supporting / displaying `oneOf`s correctly. We therefore decided to exchange the server implementation to connectRPC, which apart from supporting connect as protocol, also also "standard" gRCP clients as well as HTTP/1.1 / rest like clients, e.g. curl directly call the server without any additional gateway. # How the Problems Are Solved - All v2 services are moved to connectRPC implementation. (v1 services are still served as pure grpc servers) - All gRPC server interceptors were migrated / copied to a corresponding connectRPC interceptor. - API.ListGrpcServices and API. ListGrpcMethods were changed to include the connect services and endpoints. - gRPC server reflection was changed to a `StaticReflector` using the `ListGrpcServices` list. - The `grpc.Server` interfaces was split into different combinations to be able to handle the different cases (grpc server and prefixed gateway, connect server with grpc gateway, connect server only, ...) - Docs of services serving connectRPC only with no additional gateway (instance, webkey, project, app, org v2 beta) are changed to expose that - since the plugin is not yet available on buf, we download it using `postinstall` hook of the docs # Additional Changes - WebKey service is added as v2 service (in addition to the current v2beta) # Additional Context closes #9483 --------- Co-authored-by: Elio Bischof <elio@zitadel.com>
127 lines
4.0 KiB
Go
127 lines
4.0 KiB
Go
package action
|
|
|
|
import (
|
|
"context"
|
|
|
|
"connectrpc.com/connect"
|
|
"github.com/muhlemmer/gu"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
|
action "github.com/zitadel/zitadel/pkg/grpc/action/v2beta"
|
|
)
|
|
|
|
func (s *Server) CreateTarget(ctx context.Context, req *connect.Request[action.CreateTargetRequest]) (*connect.Response[action.CreateTargetResponse], error) {
|
|
add := createTargetToCommand(req.Msg)
|
|
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
createdAt, err := s.command.AddTarget(ctx, add, instanceID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var creationDate *timestamppb.Timestamp
|
|
if !createdAt.IsZero() {
|
|
creationDate = timestamppb.New(createdAt)
|
|
}
|
|
return connect.NewResponse(&action.CreateTargetResponse{
|
|
Id: add.AggregateID,
|
|
CreationDate: creationDate,
|
|
SigningKey: add.SigningKey,
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) UpdateTarget(ctx context.Context, req *connect.Request[action.UpdateTargetRequest]) (*connect.Response[action.UpdateTargetResponse], error) {
|
|
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
update := updateTargetToCommand(req.Msg)
|
|
changedAt, err := s.command.ChangeTarget(ctx, update, instanceID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var changeDate *timestamppb.Timestamp
|
|
if !changedAt.IsZero() {
|
|
changeDate = timestamppb.New(changedAt)
|
|
}
|
|
return connect.NewResponse(&action.UpdateTargetResponse{
|
|
ChangeDate: changeDate,
|
|
SigningKey: update.SigningKey,
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) DeleteTarget(ctx context.Context, req *connect.Request[action.DeleteTargetRequest]) (*connect.Response[action.DeleteTargetResponse], error) {
|
|
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
deletedAt, err := s.command.DeleteTarget(ctx, req.Msg.GetId(), instanceID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var deletionDate *timestamppb.Timestamp
|
|
if !deletedAt.IsZero() {
|
|
deletionDate = timestamppb.New(deletedAt)
|
|
}
|
|
return connect.NewResponse(&action.DeleteTargetResponse{
|
|
DeletionDate: deletionDate,
|
|
}), nil
|
|
}
|
|
|
|
func createTargetToCommand(req *action.CreateTargetRequest) *command.AddTarget {
|
|
var (
|
|
targetType domain.TargetType
|
|
interruptOnError bool
|
|
)
|
|
switch t := req.GetTargetType().(type) {
|
|
case *action.CreateTargetRequest_RestWebhook:
|
|
targetType = domain.TargetTypeWebhook
|
|
interruptOnError = t.RestWebhook.InterruptOnError
|
|
case *action.CreateTargetRequest_RestCall:
|
|
targetType = domain.TargetTypeCall
|
|
interruptOnError = t.RestCall.InterruptOnError
|
|
case *action.CreateTargetRequest_RestAsync:
|
|
targetType = domain.TargetTypeAsync
|
|
}
|
|
return &command.AddTarget{
|
|
Name: req.GetName(),
|
|
TargetType: targetType,
|
|
Endpoint: req.GetEndpoint(),
|
|
Timeout: req.GetTimeout().AsDuration(),
|
|
InterruptOnError: interruptOnError,
|
|
}
|
|
}
|
|
|
|
func updateTargetToCommand(req *action.UpdateTargetRequest) *command.ChangeTarget {
|
|
expirationSigningKey := false
|
|
// TODO handle expiration, currently only immediate expiration is supported
|
|
if req.GetExpirationSigningKey() != nil {
|
|
expirationSigningKey = true
|
|
}
|
|
|
|
if req == nil {
|
|
return nil
|
|
}
|
|
target := &command.ChangeTarget{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: req.GetId(),
|
|
},
|
|
Name: req.Name,
|
|
Endpoint: req.Endpoint,
|
|
ExpirationSigningKey: expirationSigningKey,
|
|
}
|
|
if req.TargetType != nil {
|
|
switch t := req.GetTargetType().(type) {
|
|
case *action.UpdateTargetRequest_RestWebhook:
|
|
target.TargetType = gu.Ptr(domain.TargetTypeWebhook)
|
|
target.InterruptOnError = gu.Ptr(t.RestWebhook.InterruptOnError)
|
|
case *action.UpdateTargetRequest_RestCall:
|
|
target.TargetType = gu.Ptr(domain.TargetTypeCall)
|
|
target.InterruptOnError = gu.Ptr(t.RestCall.InterruptOnError)
|
|
case *action.UpdateTargetRequest_RestAsync:
|
|
target.TargetType = gu.Ptr(domain.TargetTypeAsync)
|
|
target.InterruptOnError = gu.Ptr(false)
|
|
}
|
|
}
|
|
if req.Timeout != nil {
|
|
target.Timeout = gu.Ptr(req.GetTimeout().AsDuration())
|
|
}
|
|
return target
|
|
}
|