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

fixup! Merge branch 'main' into org_api_merge

Browse Source
This commit is contained in:
Iraq Jaber
2025-05-30 18:36:21 +02:00
parent f073a8ff3a
commit 99d33505cf
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/api/grpc/org/v2beta/integration_test/org_test.go
View File

@@ -893,7 +893,7 @@ func TestServer_DeactivateOrganization(t *testing.T) {
} }
} }
func TestServer_AddOerganizationDomain(t *testing.T) { func TestServer_AddOrganizationDomain(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
ctx context.Context ctx context.Context
@@ -903,7 +903,7 @@ func TestServer_AddOerganizationDomain(t *testing.T) {
}{ }{
{ {
name: "add org domain, happy path", name: "add org domain, happy path",
domain: "www.domain.com", domain: gofakeit.URL(),
testFunc: func() string { testFunc: func() string {
orgs, _, err := createOrgs(CTX, Client, 1) orgs, _, err := createOrgs(CTX, Client, 1)
if err != nil { if err != nil {
@@ -916,7 +916,7 @@ func TestServer_AddOerganizationDomain(t *testing.T) {
}, },
{ {
name: "add org domain, twice", name: "add org domain, twice",
domain: "www.domain.com", domain: gofakeit.URL(),
testFunc: func() string { testFunc: func() string {
// 1. create organization // 1. create organization
orgs, _, err := createOrgs(CTX, Client, 1) orgs, _, err := createOrgs(CTX, Client, 1)
@@ -926,7 +926,7 @@ func TestServer_AddOerganizationDomain(t *testing.T) {
} }
orgId := orgs[0].Id orgId := orgs[0].Id
domain := "www.domain.com" domain := gofakeit.URL()
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -956,16 +956,15 @@ func TestServer_AddOerganizationDomain(t *testing.T) {
return orgId return orgId
}, },
err: errors.New("AlreadyExists"),
}, },
{ {
name: "add org domain to non existent org", name: "add org domain to non existent org",
domain: "www.domain.com", domain: gofakeit.URL(),
testFunc: func() string { testFunc: func() string {
return "non-existing-org-id" return "non-existing-org-id"
}, },
// BUG: // BUG: should return a error
err: errors.New("Domain already exists"), err: nil,
}, },
} }
@@ -991,6 +990,7 @@ func TestServer_AddOerganizationDomain(t *testing.T) {
} }
func TestServer_ListOrganizationDomain(t *testing.T) { func TestServer_ListOrganizationDomain(t *testing.T) {
domain := gofakeit.URL()
tests := []struct { tests := []struct {
name string name string
ctx context.Context ctx context.Context
@@ -1000,7 +1000,7 @@ func TestServer_ListOrganizationDomain(t *testing.T) {
}{ }{
{ {
name: "list org domain, happy path", name: "list org domain, happy path",
domain: "www.domain.com", domain: domain,
testFunc: func() string { testFunc: func() string {
// 1. create organization // 1. create organization
orgs, _, err := createOrgs(CTX, Client, 1) orgs, _, err := createOrgs(CTX, Client, 1)
@@ -1009,8 +1009,6 @@ func TestServer_ListOrganizationDomain(t *testing.T) {
return "" return ""
} }
orgId := orgs[0].Id orgId := orgs[0].Id
domain := "www.domain.com"
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1055,6 +1053,7 @@ func TestServer_ListOrganizationDomain(t *testing.T) {
} }
func TestServer_DeleteOerganizationDomain(t *testing.T) { func TestServer_DeleteOerganizationDomain(t *testing.T) {
domain := gofakeit.URL()
tests := []struct { tests := []struct {
name string name string
ctx context.Context ctx context.Context
@@ -1064,7 +1063,7 @@ func TestServer_DeleteOerganizationDomain(t *testing.T) {
}{ }{
{ {
name: "delete org domain, happy path", name: "delete org domain, happy path",
domain: "www.domain.com", domain: domain,
testFunc: func() string { testFunc: func() string {
// 1. create organization // 1. create organization
orgs, _, err := createOrgs(CTX, Client, 1) orgs, _, err := createOrgs(CTX, Client, 1)
@@ -1074,7 +1073,6 @@ func TestServer_DeleteOerganizationDomain(t *testing.T) {
} }
orgId := orgs[0].Id orgId := orgs[0].Id
domain := "www.domain.com"
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1107,7 +1105,7 @@ func TestServer_DeleteOerganizationDomain(t *testing.T) {
}, },
{ {
name: "delete org domain, twice", name: "delete org domain, twice",
domain: "www.domain.com", domain: gofakeit.URL(),
testFunc: func() string { testFunc: func() string {
// 1. create organization // 1. create organization
orgs, _, err := createOrgs(CTX, Client, 1) orgs, _, err := createOrgs(CTX, Client, 1)
@@ -1117,7 +1115,7 @@ func TestServer_DeleteOerganizationDomain(t *testing.T) {
} }
orgId := orgs[0].Id orgId := orgs[0].Id
domain := "www.domain.com" domain := gofakeit.URL()
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1157,7 +1155,7 @@ func TestServer_DeleteOerganizationDomain(t *testing.T) {
}, },
{ {
name: "delete org domain to non existent org", name: "delete org domain to non existent org",
domain: "www.domain.com", domain: gofakeit.URL(),
testFunc: func() string { testFunc: func() string {
return "non-existing-org-id" return "non-existing-org-id"
}, },
@@ -1202,7 +1200,7 @@ func TestServer_AddListDeleteOrganizationDomain(t *testing.T) {
orgId := orgs[0].Id orgId := orgs[0].Id
// ctx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner) // ctx := Instance.WithAuthorization(CTX, integration.UserTypeIAMOwner)
domain := "www.domain.com" domain := gofakeit.URL()
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1252,7 +1250,7 @@ func TestServer_AddListDeleteOrganizationDomain(t *testing.T) {
} }
orgId := orgs[0].Id orgId := orgs[0].Id
domain := "www.domain2.com" domain := gofakeit.URL()
// 2. add domain // 2. add domain
addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ addOrgDomainRes, err := Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
@@ -1339,7 +1337,7 @@ func TestServer_ValidateOrganizationDomain(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
} }
domain := "www.domainnn.com" domain := gofakeit.URL()
_, err = Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{ _, err = Client.AddOrganizationDomain(CTX, &v2beta_org.AddOrganizationDomainRequest{
OrganizationId: orgId, OrganizationId: orgId,
Domain: domain, Domain: domain,