mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 21:52:54 +00:00
5f34d1af8f
# Which Problems Are Solved Recent changes to the v2beta and v2 API of the organization service were directly merged to the `next` branch and release on v4.x, since the ongoing move to the relation table, blocked it from being merged into main. # How the Problems Are Solved This PR ports the following changes into main: - fix(api): correct permission check in organization v2beta service: https://github.com/zitadel/zitadel/commit/8dcfff97ed52a8b9fc77ecb1f972744f42cff3ed - fix(actions v1): return org metadata again (https://github.com/zitadel/zitadel/pull/11040) - feat(api): move organization api (https://github.com/zitadel/zitadel/pull/11045) # Additional Changes None # Additional Context relates to #10772 --------- Co-authored-by: Gayathri Vijayan <[email protected]>
65 lines
1.8 KiB
Go
65 lines
1.8 KiB
Go
package org
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"connectrpc.com/connect"
|
|
"google.golang.org/protobuf/reflect/protoreflect"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/api/grpc/server"
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
"github.com/zitadel/zitadel/internal/config/systemdefaults"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/pkg/grpc/org/v2"
|
|
"github.com/zitadel/zitadel/pkg/grpc/org/v2/orgconnect"
|
|
)
|
|
|
|
var _ orgconnect.OrganizationServiceHandler = (*Server)(nil)
|
|
|
|
type Server struct {
|
|
systemDefaults systemdefaults.SystemDefaults
|
|
command *command.Commands
|
|
query *query.Queries
|
|
checkPermission domain.PermissionCheck
|
|
}
|
|
|
|
func CreateServer(
|
|
systemDefaults systemdefaults.SystemDefaults,
|
|
command *command.Commands,
|
|
query *query.Queries,
|
|
checkPermission domain.PermissionCheck,
|
|
) *Server {
|
|
return &Server{
|
|
systemDefaults: systemDefaults,
|
|
command: command,
|
|
query: query,
|
|
checkPermission: checkPermission,
|
|
}
|
|
}
|
|
|
|
func (s *Server) RegisterConnectServer(interceptors ...connect.Interceptor) (string, http.Handler) {
|
|
return orgconnect.NewOrganizationServiceHandler(s, connect.WithInterceptors(interceptors...))
|
|
}
|
|
|
|
func (s *Server) FileDescriptor() protoreflect.FileDescriptor {
|
|
return org.File_zitadel_org_v2_org_service_proto
|
|
}
|
|
|
|
func (s *Server) AppName() string {
|
|
return org.OrganizationService_ServiceDesc.ServiceName
|
|
}
|
|
|
|
func (s *Server) MethodPrefix() string {
|
|
return org.OrganizationService_ServiceDesc.ServiceName
|
|
}
|
|
|
|
func (s *Server) AuthMethods() authz.MethodMapping {
|
|
return org.OrganizationService_AuthMethods
|
|
}
|
|
|
|
func (s *Server) RegisterGateway() server.RegisterGatewayFunc {
|
|
return org.RegisterOrganizationServiceHandler
|
|
}
|