mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-16 14:08:36 +00:00
9ebf2316c6
# 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>
104 lines
3.5 KiB
Go
104 lines
3.5 KiB
Go
package user
|
|
|
|
import (
|
|
"context"
|
|
|
|
"connectrpc.com/connect"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
"github.com/zitadel/zitadel/pkg/grpc/object/v2"
|
|
"github.com/zitadel/zitadel/pkg/grpc/user/v2"
|
|
)
|
|
|
|
func (s *Server) SetPhone(ctx context.Context, req *connect.Request[user.SetPhoneRequest]) (resp *connect.Response[user.SetPhoneResponse], err error) {
|
|
var phone *domain.Phone
|
|
|
|
switch v := req.Msg.GetVerification().(type) {
|
|
case *user.SetPhoneRequest_SendCode:
|
|
phone, err = s.command.ChangeUserPhone(ctx, req.Msg.GetUserId(), req.Msg.GetPhone(), s.userCodeAlg)
|
|
case *user.SetPhoneRequest_ReturnCode:
|
|
phone, err = s.command.ChangeUserPhoneReturnCode(ctx, req.Msg.GetUserId(), req.Msg.GetPhone(), s.userCodeAlg)
|
|
case *user.SetPhoneRequest_IsVerified:
|
|
phone, err = s.command.ChangeUserPhoneVerified(ctx, req.Msg.GetUserId(), req.Msg.GetPhone())
|
|
case nil:
|
|
phone, err = s.command.ChangeUserPhone(ctx, req.Msg.GetUserId(), req.Msg.GetPhone(), s.userCodeAlg)
|
|
default:
|
|
err = zerrors.ThrowUnimplementedf(nil, "USERv2-Ahng0", "verification oneOf %T in method SetPhone not implemented", v)
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return connect.NewResponse(&user.SetPhoneResponse{
|
|
Details: &object.Details{
|
|
Sequence: phone.Sequence,
|
|
ChangeDate: timestamppb.New(phone.ChangeDate),
|
|
ResourceOwner: phone.ResourceOwner,
|
|
},
|
|
VerificationCode: phone.PlainCode,
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) RemovePhone(ctx context.Context, req *connect.Request[user.RemovePhoneRequest]) (resp *connect.Response[user.RemovePhoneResponse], err error) {
|
|
details, err := s.command.RemoveUserPhone(ctx,
|
|
req.Msg.GetUserId(),
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return connect.NewResponse(&user.RemovePhoneResponse{
|
|
Details: &object.Details{
|
|
Sequence: details.Sequence,
|
|
ChangeDate: timestamppb.New(details.EventDate),
|
|
ResourceOwner: details.ResourceOwner,
|
|
},
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) ResendPhoneCode(ctx context.Context, req *connect.Request[user.ResendPhoneCodeRequest]) (resp *connect.Response[user.ResendPhoneCodeResponse], err error) {
|
|
var phone *domain.Phone
|
|
switch v := req.Msg.GetVerification().(type) {
|
|
case *user.ResendPhoneCodeRequest_SendCode:
|
|
phone, err = s.command.ResendUserPhoneCode(ctx, req.Msg.GetUserId(), s.userCodeAlg)
|
|
case *user.ResendPhoneCodeRequest_ReturnCode:
|
|
phone, err = s.command.ResendUserPhoneCodeReturnCode(ctx, req.Msg.GetUserId(), s.userCodeAlg)
|
|
case nil:
|
|
phone, err = s.command.ResendUserPhoneCode(ctx, req.Msg.GetUserId(), s.userCodeAlg)
|
|
default:
|
|
err = zerrors.ThrowUnimplementedf(nil, "USERv2-ResendUserPhoneCode", "verification oneOf %T in method SetPhone not implemented", v)
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return connect.NewResponse(&user.ResendPhoneCodeResponse{
|
|
Details: &object.Details{
|
|
Sequence: phone.Sequence,
|
|
ChangeDate: timestamppb.New(phone.ChangeDate),
|
|
ResourceOwner: phone.ResourceOwner,
|
|
},
|
|
VerificationCode: phone.PlainCode,
|
|
}), nil
|
|
}
|
|
|
|
func (s *Server) VerifyPhone(ctx context.Context, req *connect.Request[user.VerifyPhoneRequest]) (*connect.Response[user.VerifyPhoneResponse], error) {
|
|
details, err := s.command.VerifyUserPhone(ctx,
|
|
req.Msg.GetUserId(),
|
|
req.Msg.GetVerificationCode(),
|
|
s.userCodeAlg,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&user.VerifyPhoneResponse{
|
|
Details: &object.Details{
|
|
Sequence: details.Sequence,
|
|
ChangeDate: timestamppb.New(details.EventDate),
|
|
ResourceOwner: details.ResourceOwner,
|
|
},
|
|
}), nil
|
|
}
|