From 5e3951c7f810d6d24f2b6e0bc1d459aa7715b3a0 Mon Sep 17 00:00:00 2001 From: Iraq Jaber Date: Wed, 21 May 2025 16:36:44 +0200 Subject: [PATCH] fixup! fixup! Merge branch 'main' into org_api --- internal/api/grpc/org/v2beta/org_test.go | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/api/grpc/org/v2beta/org_test.go b/internal/api/grpc/org/v2beta/org_test.go index 78330bddbc..cc34ccaa53 100644 --- a/internal/api/grpc/org/v2beta/org_test.go +++ b/internal/api/grpc/org/v2beta/org_test.go @@ -12,13 +12,13 @@ import ( "github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/zerrors" - org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta" + v2beta_org "github.com/zitadel/zitadel/pkg/grpc/org/v2beta" user "github.com/zitadel/zitadel/pkg/grpc/user/v2beta" ) func Test_createOrganizationRequestToCommand(t *testing.T) { type args struct { - request *org.CreateOrganizationRequest + request *v2beta_org.CreateOrganizationRequest } tests := []struct { name string @@ -29,9 +29,9 @@ func Test_createOrganizationRequestToCommand(t *testing.T) { { name: "nil user", args: args{ - request: &org.CreateOrganizationRequest{ + request: &v2beta_org.CreateOrganizationRequest{ Name: "name", - Admins: []*org.CreateOrganizationRequest_Admin{ + Admins: []*v2beta_org.CreateOrganizationRequest_Admin{ {}, }, }, @@ -41,11 +41,11 @@ func Test_createOrganizationRequestToCommand(t *testing.T) { { name: "user ID", args: args{ - request: &org.CreateOrganizationRequest{ + request: &v2beta_org.CreateOrganizationRequest{ Name: "name", - Admins: []*org.CreateOrganizationRequest_Admin{ + Admins: []*v2beta_org.CreateOrganizationRequest_Admin{ { - UserType: &org.CreateOrganizationRequest_Admin_UserId{ + UserType: &v2beta_org.CreateOrganizationRequest_Admin_UserId{ UserId: "userID", }, Roles: nil, @@ -66,11 +66,11 @@ func Test_createOrganizationRequestToCommand(t *testing.T) { { name: "human user", args: args{ - request: &org.CreateOrganizationRequest{ + request: &v2beta_org.CreateOrganizationRequest{ Name: "name", - Admins: []*org.CreateOrganizationRequest_Admin{ + Admins: []*v2beta_org.CreateOrganizationRequest_Admin{ { - UserType: &org.CreateOrganizationRequest_Admin_Human{ + UserType: &v2beta_org.CreateOrganizationRequest_Admin_Human{ Human: &user.AddHumanUserRequest{ Profile: &user.SetHumanProfile{ GivenName: "firstname", @@ -123,7 +123,7 @@ func Test_createdOrganizationToPb(t *testing.T) { tests := []struct { name string args args - want *org.CreateOrganizationResponse + want *v2beta_org.CreateOrganizationResponse wantErr error }{ { @@ -144,10 +144,10 @@ func Test_createdOrganizationToPb(t *testing.T) { }, }, }, - want: &org.CreateOrganizationResponse{ + want: &v2beta_org.CreateOrganizationResponse{ CreationDate: timestamppb.New(now), Id: "orgID", - CreatedAdmins: []*org.CreatedAdmin{ + CreatedAdmins: []*v2beta_org.CreatedAdmin{ { UserId: "id", EmailCode: gu.Ptr("emailCode"),