TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 13:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Merge branch 'main' into org_api

Browse Source
This commit is contained in:
Iraq Jaber
2025-05-08 20:33:34 +02:00
parent 23b7b3fafe
commit a26ccd5393
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/api/grpc/object/v2beta/converter.go
View File

@@ -99,12 +99,6 @@ func DomainToPb(d *query.Domain) *org_pb.Domain {
IsVerified: d.IsVerified, IsVerified: d.IsVerified,
IsPrimary: d.IsPrimary, IsPrimary: d.IsPrimary,
ValidationType: DomainValidationTypeFromModel(d.ValidationType), ValidationType: DomainValidationTypeFromModel(d.ValidationType),
Details: ToViewDetailsPb(
d.Sequence,
d.CreationDate,
d.ChangeDate,
d.OrgID,
),
} }
} }

4
internal/api/grpc/org/v2beta/helper.go
View File

@@ -76,9 +76,9 @@ func OrgStateToPb(state domain.OrgState) v2beta_org.OrgState {
} }
func createdOrganizationToPb(createdOrg *command.CreatedOrg) (_ *org.CreateOrganizationResponse, err error) { func createdOrganizationToPb(createdOrg *command.CreatedOrg) (_ *org.CreateOrganizationResponse, err error) {
admins := make([]*org.CreateOrganizationResponse_CreatedAdmin, len(createdOrg.CreatedAdmins)) admins := make([]*org.CreatedAdmin, len(createdOrg.CreatedAdmins))
for i, admin := range createdOrg.CreatedAdmins { for i, admin := range createdOrg.CreatedAdmins {
admins[i] = &org.CreateOrganizationResponse_CreatedAdmin{ admins[i] = &org.CreatedAdmin{
UserId: admin.ID, UserId: admin.ID,
EmailCode: admin.EmailCode, EmailCode: admin.EmailCode,
PhoneCode: admin.PhoneCode, PhoneCode: admin.PhoneCode,

2
internal/api/grpc/org/v2beta/org_test.go
View File

@@ -147,7 +147,7 @@ func Test_createdOrganizationToPb(t *testing.T) {
want: &org.CreateOrganizationResponse{ want: &org.CreateOrganizationResponse{
CreatedDate: timestamppb.New(now), CreatedDate: timestamppb.New(now),
Id: "orgID", Id: "orgID",
CreatedAdmins: []*org.CreateOrganizationResponse_CreatedAdmin{ CreatedAdmins: []*org.CreatedAdmin{
{ {
UserId: "id", UserId: "id",
EmailCode: gu.Ptr("emailCode"), EmailCode: gu.Ptr("emailCode"),