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

cleanup

Browse Source
This commit is contained in:
adlerhurst
2025-07-25 17:59:02 +02:00
parent 24ef46e75b
commit 1054a4bd53
4 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
backend/v3/domain/instance_domain.go
View File

@@ -8,11 +8,11 @@ import (
)
type InstanceDomain struct {
InstanceID string `json:"instanceId,omitempty" db:"instance_id"`
Domain string `json:"domain,omitempty" db:"domain"`
IsVerified bool `json:"isVerified,omitempty" db:"is_verified"`
IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"`
ValidationType DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
InstanceID string `json:"instanceId,omitempty" db:"instance_id"`
Domain string `json:"domain,omitempty" db:"domain"`
IsVerified bool `json:"isVerified,omitempty" db:"is_verified"`
IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"`
ValidationType *DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
CreatedAt time.Time `json:"createdAt,omitzero" db:"created_at"`
UpdatedAt time.Time `json:"updatedAt,omitzero" db:"updated_at"`

24
backend/v3/domain/organization_domain.go
View File

@@ -8,24 +8,24 @@ import (
)
type OrganizationDomain struct {
InstanceID string `json:"instanceId,omitempty" db:"instance_id"`
OrgID string `json:"orgId,omitempty" db:"org_id"`
Domain string `json:"domain,omitempty" db:"domain"`
IsVerified bool `json:"isVerified,omitempty" db:"is_verified"`
IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"`
ValidationType DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
InstanceID string `json:"instanceId,omitempty" db:"instance_id"`
OrgID string `json:"orgId,omitempty" db:"org_id"`
Domain string `json:"domain,omitempty" db:"domain"`
IsVerified bool `json:"isVerified,omitempty" db:"is_verified"`
IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"`
ValidationType *DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
CreatedAt time.Time `json:"createdAt,omitzero" db:"created_at"`
UpdatedAt time.Time `json:"updatedAt,omitzero" db:"updated_at"`
}
type AddOrganizationDomain struct {
InstanceID string `json:"instanceId,omitempty" db:"instance_id"`
OrgID string `json:"orgId,omitempty" db:"org_id"`
Domain string `json:"domain,omitempty" db:"domain"`
IsVerified bool `json:"isVerified,omitempty" db:"is_verified"`
IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"`
ValidationType DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
InstanceID string `json:"instanceId,omitempty" db:"instance_id"`
OrgID string `json:"orgId,omitempty" db:"org_id"`
Domain string `json:"domain,omitempty" db:"domain"`
IsVerified bool `json:"isVerified,omitempty" db:"is_verified"`
IsPrimary bool `json:"isPrimary,omitempty" db:"is_primary"`
ValidationType *DomainValidationType `json:"validationType,omitempty" db:"validation_type"`
// CreatedAt is the time when the domain was added.
// It is set by the repository and should not be set by the caller.

6
backend/v3/storage/database/repository/instance_domain_test.go
View File

@@ -221,7 +221,7 @@ func TestGetInstanceDomain(t *testing.T) {
Domain: domainName1,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
},
{
@@ -234,7 +234,7 @@ func TestGetInstanceDomain(t *testing.T) {
Domain: domainName2,
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP,
ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
},
},
{
@@ -247,7 +247,7 @@ func TestGetInstanceDomain(t *testing.T) {
Domain: domainName1,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
},
{

45
backend/v3/storage/database/repository/org_domain_test.go
View File

@@ -5,6 +5,7 @@ import (
"testing"
"github.com/brianvoe/gofakeit/v6"
"github.com/muhlemmer/gu"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -52,7 +53,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
},
{
@@ -63,7 +64,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: true,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP,
ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
},
},
{
@@ -74,7 +75,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
},
{
@@ -85,7 +86,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: "",
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
err: new(database.CheckError),
},
@@ -100,7 +101,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: domainName,
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}
err := domainRepo.Add(ctx, organizationDomain)
@@ -113,7 +114,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: domainName,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeHTTP,
ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
}
},
err: new(database.UniqueError),
@@ -126,7 +127,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
err: new(database.ForeignKeyError),
},
@@ -138,7 +139,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
err: new(database.ForeignKeyError),
},
@@ -149,7 +150,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
err: new(database.ForeignKeyError),
},
@@ -160,7 +161,7 @@ func TestAddOrganizationDomain(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
err: new(database.ForeignKeyError),
},
@@ -249,7 +250,7 @@ func TestGetOrganizationDomain(t *testing.T) {
Domain: domainName1,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}
domain2 := &domain.AddOrganizationDomain{
InstanceID: instanceID,
@@ -257,7 +258,7 @@ func TestGetOrganizationDomain(t *testing.T) {
Domain: domainName2,
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP,
ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
}
err = domainRepo.Add(t.Context(), domain1)
@@ -282,7 +283,7 @@ func TestGetOrganizationDomain(t *testing.T) {
Domain: domainName1,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
},
{
@@ -296,7 +297,7 @@ func TestGetOrganizationDomain(t *testing.T) {
Domain: domainName2,
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP,
ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
},
},
{
@@ -311,7 +312,7 @@ func TestGetOrganizationDomain(t *testing.T) {
Domain: domainName1,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
},
{
@@ -325,7 +326,7 @@ func TestGetOrganizationDomain(t *testing.T) {
Domain: domainName1,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
},
{
@@ -405,7 +406,7 @@ func TestListOrganizationDomains(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
{
InstanceID: instanceID,
@@ -413,7 +414,7 @@ func TestListOrganizationDomains(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP,
ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
},
{
InstanceID: instanceID,
@@ -421,7 +422,7 @@ func TestListOrganizationDomains(t *testing.T) {
Domain: gofakeit.DomainName(),
IsVerified: true,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
},
}
@@ -541,7 +542,7 @@ func TestUpdateOrganizationDomain(t *testing.T) {
Domain: domainName,
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}
err = domainRepo.Add(t.Context(), organizationDomain)
@@ -677,7 +678,7 @@ func TestRemoveOrganizationDomain(t *testing.T) {
Domain: domainName1,
IsVerified: true,
IsPrimary: true,
ValidationType: domain.DomainValidationTypeDNS,
ValidationType: gu.Ptr(domain.DomainValidationTypeDNS),
}
domain2 := &domain.AddOrganizationDomain{
InstanceID: instanceID,
@@ -685,7 +686,7 @@ func TestRemoveOrganizationDomain(t *testing.T) {
Domain: domainName2,
IsVerified: false,
IsPrimary: false,
ValidationType: domain.DomainValidationTypeHTTP,
ValidationType: gu.Ptr(domain.DomainValidationTypeHTTP),
}
err = domainRepo.Add(t.Context(), domain1)