mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-13 21:10:57 +00:00
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! added first event
This commit is contained in:
@@ -52,6 +52,7 @@ const (
|
|||||||
OIDCMappingFieldPreferredLoginName
|
OIDCMappingFieldPreferredLoginName
|
||||||
OIDCMappingFieldEmail
|
OIDCMappingFieldEmail
|
||||||
// count is for validation purposes
|
// count is for validation purposes
|
||||||
|
//nolint: unused
|
||||||
oidcMappingFieldCount
|
oidcMappingFieldCount
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@@ -9,6 +9,7 @@ import (
|
|||||||
"github.com/brianvoe/gofakeit/v6"
|
"github.com/brianvoe/gofakeit/v6"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
durationpb "google.golang.org/protobuf/types/known/durationpb"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/backend/v3/domain"
|
"github.com/zitadel/zitadel/backend/v3/domain"
|
||||||
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
||||||
@@ -18,7 +19,6 @@ import (
|
|||||||
"github.com/zitadel/zitadel/pkg/grpc/admin"
|
"github.com/zitadel/zitadel/pkg/grpc/admin"
|
||||||
"github.com/zitadel/zitadel/pkg/grpc/idp"
|
"github.com/zitadel/zitadel/pkg/grpc/idp"
|
||||||
idp_grpc "github.com/zitadel/zitadel/pkg/grpc/idp"
|
idp_grpc "github.com/zitadel/zitadel/pkg/grpc/idp"
|
||||||
durationpb "google.golang.org/protobuf/types/known/durationpb"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var validSAMLMetadata1 = []byte(`<?xml version="1.0" encoding="UTF-8"?>
|
var validSAMLMetadata1 = []byte(`<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
@@ -5,11 +5,11 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/muhlemmer/gu"
|
|
||||||
|
|
||||||
"github.com/brianvoe/gofakeit/v6"
|
"github.com/brianvoe/gofakeit/v6"
|
||||||
|
"github.com/muhlemmer/gu"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/backend/v3/domain"
|
"github.com/zitadel/zitadel/backend/v3/domain"
|
||||||
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
"github.com/zitadel/zitadel/backend/v3/storage/database"
|
||||||
"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
|
"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
|
||||||
@@ -175,7 +175,7 @@ func TestCreateIDProvider(t *testing.T) {
|
|||||||
State: domain.OrgStateActive.String(),
|
State: domain.OrgStateActive.String(),
|
||||||
}
|
}
|
||||||
organizationRepo := repository.OrganizationRepository(pool)
|
organizationRepo := repository.OrganizationRepository(pool)
|
||||||
err = organizationRepo.Create(t.Context(), &org)
|
err = organizationRepo.Create(ctx, &org)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
idpRepo := repository.IDProviderRepository(pool)
|
idpRepo := repository.IDProviderRepository(pool)
|
||||||
@@ -876,6 +876,10 @@ func TestGetIDProvider(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// gocognit linting fails due to number of test cases
|
||||||
|
// and the fact that each test case has a testFunc()
|
||||||
|
//
|
||||||
|
//nolint:gocognit
|
||||||
func TestListIDProvider(t *testing.T) {
|
func TestListIDProvider(t *testing.T) {
|
||||||
ctx := t.Context()
|
ctx := t.Context()
|
||||||
pool, stop, err := newEmbeddedDB(ctx)
|
pool, stop, err := newEmbeddedDB(ctx)
|
||||||
@@ -944,7 +948,7 @@ func TestListIDProvider(t *testing.T) {
|
|||||||
State: domain.OrgStateActive.String(),
|
State: domain.OrgStateActive.String(),
|
||||||
}
|
}
|
||||||
organizationRepo := repository.OrganizationRepository(pool)
|
organizationRepo := repository.OrganizationRepository(pool)
|
||||||
err = organizationRepo.Create(t.Context(), &org)
|
err = organizationRepo.Create(ctx, &org)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// create idp
|
// create idp
|
||||||
@@ -1008,7 +1012,7 @@ func TestListIDProvider(t *testing.T) {
|
|||||||
State: domain.OrgStateActive.String(),
|
State: domain.OrgStateActive.String(),
|
||||||
}
|
}
|
||||||
organizationRepo := repository.OrganizationRepository(pool)
|
organizationRepo := repository.OrganizationRepository(pool)
|
||||||
err = organizationRepo.Create(t.Context(), &org)
|
err = organizationRepo.Create(ctx, &org)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
// create idp
|
// create idp
|
||||||
@@ -1670,7 +1674,7 @@ func TestListIDProvider(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
})
|
})
|
||||||
|
|
||||||
ctx := t.Context()
|
ctx := context.WithoutCancel(t.Context())
|
||||||
|
|
||||||
idps := tt.testFunc(ctx, t)
|
idps := tt.testFunc(ctx, t)
|
||||||
|
|
||||||
|
@@ -5,14 +5,13 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"github.com/zitadel/zitadel/backend/v3/domain"
|
"github.com/zitadel/zitadel/backend/v3/domain"
|
||||||
|
db_domain "github.com/zitadel/zitadel/backend/v3/domain"
|
||||||
"github.com/zitadel/zitadel/backend/v3/storage/database/dialect/postgres"
|
"github.com/zitadel/zitadel/backend/v3/storage/database/dialect/postgres"
|
||||||
"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
|
"github.com/zitadel/zitadel/backend/v3/storage/database/repository"
|
||||||
"github.com/zitadel/zitadel/internal/repository/idpconfig"
|
|
||||||
|
|
||||||
db_domain "github.com/zitadel/zitadel/backend/v3/domain"
|
|
||||||
"github.com/zitadel/zitadel/internal/eventstore"
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
||||||
"github.com/zitadel/zitadel/internal/repository/idp"
|
"github.com/zitadel/zitadel/internal/repository/idp"
|
||||||
|
"github.com/zitadel/zitadel/internal/repository/idpconfig"
|
||||||
"github.com/zitadel/zitadel/internal/repository/instance"
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
||||||
"github.com/zitadel/zitadel/internal/repository/org"
|
"github.com/zitadel/zitadel/internal/repository/org"
|
||||||
"github.com/zitadel/zitadel/internal/zerrors"
|
"github.com/zitadel/zitadel/internal/zerrors"
|
||||||
|
Reference in New Issue
Block a user