mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-16 22:48:37 +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
2.6 KiB
Go
104 lines
2.6 KiB
Go
package user
|
|
|
|
import (
|
|
"io"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
"google.golang.org/protobuf/proto"
|
|
"google.golang.org/protobuf/types/known/structpb"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/grpc"
|
|
"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 Test_u2fRegistrationDetailsToPb(t *testing.T) {
|
|
type args struct {
|
|
details *domain.WebAuthNRegistrationDetails
|
|
err error
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
want *user.RegisterU2FResponse
|
|
wantErr error
|
|
}{
|
|
{
|
|
name: "an error",
|
|
args: args{
|
|
details: nil,
|
|
err: io.ErrClosedPipe,
|
|
},
|
|
wantErr: io.ErrClosedPipe,
|
|
},
|
|
{
|
|
name: "unmarshall error",
|
|
args: args{
|
|
details: &domain.WebAuthNRegistrationDetails{
|
|
ObjectDetails: &domain.ObjectDetails{
|
|
Sequence: 22,
|
|
EventDate: time.Unix(3000, 22),
|
|
CreationDate: time.Unix(3000, 22),
|
|
ResourceOwner: "me",
|
|
},
|
|
ID: "123",
|
|
PublicKeyCredentialCreationOptions: []byte(`\\`),
|
|
},
|
|
err: nil,
|
|
},
|
|
wantErr: zerrors.ThrowInternal(nil, "USERv2-Dohr6", "Errors.Internal"),
|
|
},
|
|
{
|
|
name: "ok",
|
|
args: args{
|
|
details: &domain.WebAuthNRegistrationDetails{
|
|
ObjectDetails: &domain.ObjectDetails{
|
|
Sequence: 22,
|
|
EventDate: time.Unix(3000, 22),
|
|
CreationDate: time.Unix(3000, 22),
|
|
ResourceOwner: "me",
|
|
},
|
|
ID: "123",
|
|
PublicKeyCredentialCreationOptions: []byte(`{"foo": "bar"}`),
|
|
},
|
|
err: nil,
|
|
},
|
|
want: &user.RegisterU2FResponse{
|
|
Details: &object.Details{
|
|
Sequence: 22,
|
|
ChangeDate: ×tamppb.Timestamp{
|
|
Seconds: 3000,
|
|
Nanos: 22,
|
|
},
|
|
CreationDate: ×tamppb.Timestamp{
|
|
Seconds: 3000,
|
|
Nanos: 22,
|
|
},
|
|
ResourceOwner: "me",
|
|
},
|
|
U2FId: "123",
|
|
PublicKeyCredentialCreationOptions: &structpb.Struct{
|
|
Fields: map[string]*structpb.Value{"foo": {Kind: &structpb.Value_StringValue{StringValue: "bar"}}},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := u2fRegistrationDetailsToPb(tt.args.details, tt.args.err)
|
|
require.ErrorIs(t, err, tt.wantErr)
|
|
if tt.want != nil && !proto.Equal(tt.want, got.Msg) {
|
|
t.Errorf("Not equal:\nExpected\n%s\nActual:%s", tt.want, got)
|
|
}
|
|
if tt.want != nil {
|
|
grpc.AllFieldsSet(t, got.Msg.ProtoReflect())
|
|
}
|
|
})
|
|
}
|
|
}
|