fix: check membership from projection (#3710)

* fix: check membership from projection

* remove authz setup
This commit is contained in:
Livio Amstutz
2022-05-25 14:07:16 +02:00
committed by GitHub
parent b6deed3e34
commit 79452da7d6
15 changed files with 51 additions and 806 deletions

View File

@@ -6,27 +6,19 @@ import (
"github.com/zitadel/zitadel/internal/authz/repository"
"github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/eventstore"
"github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/spooler"
authz_view "github.com/zitadel/zitadel/internal/authz/repository/eventsourcing/view"
sd "github.com/zitadel/zitadel/internal/config/systemdefaults"
"github.com/zitadel/zitadel/internal/crypto"
v1 "github.com/zitadel/zitadel/internal/eventstore/v1"
es_spol "github.com/zitadel/zitadel/internal/eventstore/v1/spooler"
"github.com/zitadel/zitadel/internal/id"
"github.com/zitadel/zitadel/internal/query"
)
type Config struct {
Spooler spooler.SpoolerConfig
}
type EsRepository struct {
spooler *es_spol.Spooler
eventstore.UserMembershipRepo
eventstore.TokenVerifierRepo
}
func Start(conf Config, systemDefaults sd.SystemDefaults, queries *query.Queries, dbClient *sql.DB, keyEncryptionAlgorithm crypto.EncryptionAlgorithm) (repository.Repository, error) {
func Start(queries *query.Queries, dbClient *sql.DB, keyEncryptionAlgorithm crypto.EncryptionAlgorithm) (repository.Repository, error) {
es, err := v1.Start(dbClient)
if err != nil {
return nil, err
@@ -38,12 +30,9 @@ func Start(conf Config, systemDefaults sd.SystemDefaults, queries *query.Queries
return nil, err
}
spool := spooler.StartSpooler(conf.Spooler, es, view, dbClient, systemDefaults)
return &EsRepository{
spool,
eventstore.UserMembershipRepo{
View: view,
Queries: queries,
},
eventstore.TokenVerifierRepo{
TokenVerificationKey: keyEncryptionAlgorithm,
@@ -55,7 +44,7 @@ func Start(conf Config, systemDefaults sd.SystemDefaults, queries *query.Queries
}
func (repo *EsRepository) Health(ctx context.Context) error {
if err := repo.UserMembershipRepo.Health(); err != nil {
if err := repo.TokenVerifierRepo.Health(); err != nil {
return err
}
return nil