feat: iam query (#3085)

* fix: only show factors with state ready

* fix: get iam by id and clean up code

* fix: get iam by id and clean up code

* fix: remove unused code
This commit is contained in:
Fabi
2022-01-21 14:01:25 +01:00
committed by GitHub
parent 37d8e23186
commit 01501c5087
31 changed files with 280 additions and 548 deletions

View File

@@ -1,38 +0,0 @@
package eventstore
import (
"context"
"net/http"
"github.com/caos/logging"
"golang.org/x/text/language"
"github.com/caos/zitadel/internal/i18n"
"github.com/caos/zitadel/internal/query"
"github.com/caos/zitadel/internal/iam/model"
)
type IAMRepository struct {
IAMID string
LoginDir http.FileSystem
IAMV2QuerySide *query.Queries
supportedLangs []language.Tag
}
func (repo *IAMRepository) Languages(ctx context.Context) ([]language.Tag, error) {
if len(repo.supportedLangs) == 0 {
langs, err := i18n.SupportedLanguages(repo.LoginDir)
if err != nil {
logging.Log("ADMIN-tiMWs").WithError(err).Debug("unable to parse language")
return nil, err
}
repo.supportedLangs = langs
}
return repo.supportedLangs, nil
}
func (repo *IAMRepository) GetIAM(ctx context.Context) (*model.IAM, error) {
return repo.IAMV2QuerySide.IAMByID(ctx, repo.IAMID)
}

View File

@@ -3,9 +3,6 @@ package eventsourcing
import (
"context"
"github.com/caos/logging"
"github.com/rakyll/statik/fs"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/auth/repository/eventsourcing/eventstore"
"github.com/caos/zitadel/internal/auth/repository/eventsourcing/spooler"
@@ -44,7 +41,6 @@ type EsRepository struct {
eventstore.UserSessionRepo
eventstore.UserGrantRepo
eventstore.OrgRepository
eventstore.IAMRepository
}
func Start(conf Config, authZ authz.Config, systemDefaults sd.SystemDefaults, command *command.Commands, queries *query.Queries, authZRepo *authz_repo.EsRepository, esV2 *es2.Eventstore) (*EsRepository, error) {
@@ -76,9 +72,6 @@ func Start(conf Config, authZ authz.Config, systemDefaults sd.SystemDefaults, co
return nil, err
}
statikLoginFS, err := fs.NewWithNamespace("login")
logging.Log("CONFI-20opp").OnError(err).Panic("unable to start login statik dir")
spool := spooler.StartSpooler(conf.Spooler, es, view, sqlClient, systemDefaults, queries)
userRepo := eventstore.UserRepo{
@@ -161,11 +154,6 @@ func Start(conf Config, authZ authz.Config, systemDefaults sd.SystemDefaults, co
Eventstore: es,
Query: queries,
},
eventstore.IAMRepository{
IAMID: systemDefaults.IamID,
LoginDir: statikLoginFS,
IAMV2QuerySide: queries,
},
}, nil
}

View File

@@ -1,14 +0,0 @@
package repository
import (
"context"
"golang.org/x/text/language"
"github.com/caos/zitadel/internal/iam/model"
)
type IAMRepository interface {
Languages(ctx context.Context) ([]language.Tag, error)
GetIAM(ctx context.Context) (*model.IAM, error)
}

View File

@@ -13,6 +13,5 @@ type Repository interface {
UserSessionRepository
UserGrantRepository
OrgRepository
IAMRepository
RefreshTokenRepository
}