feat: api v2beta to api v2 (#8283)

# Which Problems Are Solved The v2beta services are stable but not GA. # How the Problems Are Solved The v2beta services are copied to v2. The corresponding v1 and v2beta services are deprecated. # Additional Context Closes #7236 --------- Co-authored-by: Elio Bischof <[email protected]>
2026-10-26 09:12:16 +00:00 · 2024-07-26 22:39:55 +02:00
parent bc16962aac
commit 7d2d85f57c
142 changed files with 15170 additions and 386 deletions
@@ -11,9 +11,10 @@ import (
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"

+	"github.com/zitadel/zitadel/pkg/grpc/object/v2"
+	"github.com/zitadel/zitadel/pkg/grpc/user/v2"
+
 	"github.com/zitadel/zitadel/internal/integration"
-	object "github.com/zitadel/zitadel/pkg/grpc/object/v2beta"
-	user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta"
 )

 func TestServer_RegisterU2F(t *testing.T) {
@@ -106,16 +107,7 @@ func TestServer_RegisterU2F(t *testing.T) {
 }

 func TestServer_VerifyU2FRegistration(t *testing.T) {
-	userID := Tester.CreateHumanUser(CTX).GetUserId()
-	Tester.RegisterUserPasskey(CTX, userID)
-	_, sessionToken, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, userID)
-	ctx := Tester.WithAuthorizationToken(CTX, sessionToken)
-
-	pkr, err := Client.RegisterU2F(ctx, &user.RegisterU2FRequest{
-		UserId: userID,
-	})
-	require.NoError(t, err)
-	require.NotEmpty(t, pkr.GetPublicKeyCredentialCreationOptions())
+	ctx, userID, pkr := ctxFromNewUserWithRegisteredU2F(t)

 	attestationResponse, err := Tester.WebAuthN.CreateAttestationResponse(pkr.GetPublicKeyCredentialCreationOptions())
 	require.NoError(t, err)
@@ -188,3 +180,138 @@ func TestServer_VerifyU2FRegistration(t *testing.T) {
 		})
 	}
 }
+
+func ctxFromNewUserWithRegisteredU2F(t *testing.T) (context.Context, string, *user.RegisterU2FResponse) {
+	userID := Tester.CreateHumanUser(CTX).GetUserId()
+	Tester.RegisterUserPasskey(CTX, userID)
+	_, sessionToken, _, _ := Tester.CreateVerifiedWebAuthNSession(t, CTX, userID)
+	ctx := Tester.WithAuthorizationToken(CTX, sessionToken)
+
+	pkr, err := Client.RegisterU2F(ctx, &user.RegisterU2FRequest{
+		UserId: userID,
+	})
+	require.NoError(t, err)
+	require.NotEmpty(t, pkr.GetPublicKeyCredentialCreationOptions())
+	return ctx, userID, pkr
+}
+
+func ctxFromNewUserWithVerifiedU2F(t *testing.T) (context.Context, string, string) {
+	ctx, userID, pkr := ctxFromNewUserWithRegisteredU2F(t)
+
+	attestationResponse, err := Tester.WebAuthN.CreateAttestationResponse(pkr.GetPublicKeyCredentialCreationOptions())
+	require.NoError(t, err)
+
+	_, err = Client.VerifyU2FRegistration(ctx, &user.VerifyU2FRegistrationRequest{
+		UserId:              userID,
+		U2FId:               pkr.GetU2FId(),
+		PublicKeyCredential: attestationResponse,
+		TokenName:           "nice name",
+	})
+	require.NoError(t, err)
+	return ctx, userID, pkr.GetU2FId()
+}
+
+func TestServer_RemoveU2F(t *testing.T) {
+	userIDWithout := Tester.CreateHumanUser(CTX).GetUserId()
+	ctxRegistered, userIDRegistered, pkrRegistered := ctxFromNewUserWithRegisteredU2F(t)
+	_, userIDVerified, u2fVerified := ctxFromNewUserWithVerifiedU2F(t)
+	_, userIDVerifiedPermission, u2fVerifiedPermission := ctxFromNewUserWithVerifiedU2F(t)
+
+	type args struct {
+		ctx context.Context
+		req *user.RemoveU2FRequest
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    *user.RemoveU2FResponse
+		wantErr bool
+	}{
+		{
+			name: "missing user id",
+			args: args{
+				ctx: ctxRegistered,
+				req: &user.RemoveU2FRequest{
+					U2FId: "123",
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "missing u2f id",
+			args: args{
+				ctx: ctxRegistered,
+				req: &user.RemoveU2FRequest{
+					UserId: "123",
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "success, registered",
+			args: args{
+				ctx: ctxRegistered,
+				req: &user.RemoveU2FRequest{
+					UserId: userIDRegistered,
+					U2FId:  pkrRegistered.GetU2FId(),
+				},
+			},
+			want: &user.RemoveU2FResponse{
+				Details: &object.Details{
+					ChangeDate:    timestamppb.Now(),
+					ResourceOwner: Tester.Organisation.ID,
+				},
+			},
+		},
+		{
+			name: "no u2f, error",
+			args: args{
+				ctx: IamCTX,
+				req: &user.RemoveU2FRequest{
+					UserId: userIDWithout,
+					U2FId:  pkrRegistered.GetU2FId(),
+				},
+			},
+			wantErr: true,
+		},
+		{
+			name: "success, IAMOwner permission, verified",
+			args: args{
+				ctx: IamCTX,
+				req: &user.RemoveU2FRequest{
+					UserId: userIDVerified,
+					U2FId:  u2fVerified,
+				},
+			},
+			want: &user.RemoveU2FResponse{
+				Details: &object.Details{
+					ChangeDate:    timestamppb.Now(),
+					ResourceOwner: Tester.Organisation.ID,
+				},
+			},
+		},
+		{
+			name: "verified, permission error",
+			args: args{
+				ctx: UserCTX,
+				req: &user.RemoveU2FRequest{
+					UserId: userIDVerifiedPermission,
+					U2FId:  u2fVerifiedPermission,
+				},
+			},
+			wantErr: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := Client.RemoveU2F(tt.args.ctx, tt.args.req)
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			require.NotNil(t, got)
+			integration.AssertDetails(t, tt.want, got)
+		})
+	}
+}