mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-19 06:02:52 +00:00
b339a3e696
# Which Problems Are Solved This PR implements the endpoints listed in https://github.com/zitadel/zitadel/issues/10444 . # How the Problems Are Solved The implementation follows the same pattern as the Instance one. The `Add` and `Remove` are implementing the `Commander` interface, while `List` Domains endpoints are implementing the `Querier` interace. The PR adds also some forgotten calls to the relational logic for the Instance API. The commits are identifiable by the label `instance:` prepended to them. This is the complete list: bafce01b0 , 6fe7257ab , e27bc9c34 , 8133ede73 , fde667953 , a3e1135ed , ee1a6f9c1 # Additional Context - Closes #10444 --------- Co-authored-by: Elio Bischof <[email protected]> Co-authored-by: Lebogang Phoshoko <[email protected]> Co-authored-by: Wim Van Laer <[email protected]> Co-authored-by: Max Peintner <[email protected]> Co-authored-by: Gayathri Vijayan <[email protected]>
91 lines
3.2 KiB
Go
91 lines
3.2 KiB
Go
package instance
|
|
|
|
import (
|
|
"context"
|
|
|
|
"connectrpc.com/connect"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
instancev2 "github.com/zitadel/zitadel/backend/v3/api/instance/v2"
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/pkg/grpc/instance/v2"
|
|
)
|
|
|
|
func (s *Server) AddCustomDomain(ctx context.Context, req *connect.Request[instance.AddCustomDomainRequest]) (*connect.Response[instance.AddCustomDomainResponse], error) {
|
|
if authz.GetFeatures(ctx).EnableRelationalTables {
|
|
return instancev2.AddCustomDomain(ctx, req)
|
|
}
|
|
|
|
// Adding a custom domain is currently only allowed with system permissions,
|
|
// so we directly check for them in the auth interceptor and do not check here again.
|
|
details, err := s.command.AddInstanceDomain(ctx, req.Msg.GetCustomDomain())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&instance.AddCustomDomainResponse{
|
|
CreationDate: timestamppb.New(details.EventDate),
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) RemoveCustomDomain(ctx context.Context, req *connect.Request[instance.RemoveCustomDomainRequest]) (*connect.Response[instance.RemoveCustomDomainResponse], error) {
|
|
if authz.GetFeatures(ctx).EnableRelationalTables {
|
|
return instancev2.RemoveCustomDomain(ctx, req)
|
|
}
|
|
|
|
// Removing a custom domain is currently only allowed with system permissions,
|
|
// so we directly check for them in the auth interceptor and do not check here again.
|
|
details, err := s.command.RemoveInstanceDomain(ctx, req.Msg.GetCustomDomain(), false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var deletionDate *timestamppb.Timestamp
|
|
if details != nil {
|
|
deletionDate = timestamppb.New(details.EventDate)
|
|
}
|
|
|
|
return connect.NewResponse(&instance.RemoveCustomDomainResponse{
|
|
DeletionDate: deletionDate,
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) AddTrustedDomain(ctx context.Context, req *connect.Request[instance.AddTrustedDomainRequest]) (*connect.Response[instance.AddTrustedDomainResponse], error) {
|
|
if authz.GetFeatures(ctx).EnableRelationalTables {
|
|
return instancev2.AddTrustedDomain(ctx, req)
|
|
}
|
|
|
|
if err := s.checkPermission(ctx, domain.PermissionSystemInstanceWrite, domain.PermissionInstanceWrite); err != nil {
|
|
return nil, err
|
|
}
|
|
details, err := s.command.AddTrustedDomain(ctx, req.Msg.GetTrustedDomain())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&instance.AddTrustedDomainResponse{
|
|
CreationDate: timestamppb.New(details.EventDate),
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) RemoveTrustedDomain(ctx context.Context, req *connect.Request[instance.RemoveTrustedDomainRequest]) (*connect.Response[instance.RemoveTrustedDomainResponse], error) {
|
|
if authz.GetFeatures(ctx).EnableRelationalTables {
|
|
return instancev2.RemoveTrustedDomain(ctx, req)
|
|
}
|
|
if err := s.checkPermission(ctx, domain.PermissionSystemInstanceWrite, domain.PermissionInstanceWrite); err != nil {
|
|
return nil, err
|
|
}
|
|
details, err := s.command.RemoveTrustedDomain(ctx, req.Msg.GetTrustedDomain(), false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var deletionDate *timestamppb.Timestamp
|
|
if details != nil {
|
|
deletionDate = timestamppb.New(details.EventDate)
|
|
}
|
|
|
|
return connect.NewResponse(&instance.RemoveTrustedDomainResponse{
|
|
DeletionDate: deletionDate,
|
|
}), nil
|
|
}
|