From af09d570bfda79617d5a5cafab58d7300f7837de Mon Sep 17 00:00:00 2001 From: Akshay Gaikwad Date: Wed, 27 Apr 2022 16:47:03 +0530 Subject: [PATCH 1/2] [synchronizer] Omit trash oidc providers in synchronizing --- scripts/kratos/providers_sync.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kratos/providers_sync.go b/scripts/kratos/providers_sync.go index d1e0867..98a0b2e 100644 --- a/scripts/kratos/providers_sync.go +++ b/scripts/kratos/providers_sync.go @@ -43,7 +43,7 @@ type Config struct { var ProvidersDB []Provider func sync(ctx context.Context, db *bun.DB, path string) error { - err := db.NewSelect().Model(&ProvidersDB).ModelTableExpr("authsrv_oidc_provider AS provider").Scan(ctx) + err := db.NewSelect().Model(&ProvidersDB).ModelTableExpr("authsrv_oidc_provider AS provider").Where("trash = 'f'").Scan(ctx) if err != nil { return fmt.Errorf("failed to fetch providers from DB: %s", err) } From 4331eed88c9766f9b5b5ae1bad60c281130b19eb Mon Sep 17 00:00:00 2001 From: Akshay Gaikwad Date: Wed, 27 Apr 2022 18:33:03 +0530 Subject: [PATCH 2/2] [synchronizer] Map provider name to id in kratos confing --- scripts/kratos/providers_sync.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/kratos/providers_sync.go b/scripts/kratos/providers_sync.go index 98a0b2e..60cf665 100644 --- a/scripts/kratos/providers_sync.go +++ b/scripts/kratos/providers_sync.go @@ -8,7 +8,6 @@ import ( "time" "github.com/cloudflare/cfssl/log" - "github.com/google/uuid" "github.com/uptrace/bun" "github.com/uptrace/bun/dialect/pgdialect" "github.com/uptrace/bun/driver/pgdriver" @@ -16,7 +15,7 @@ import ( ) type Provider struct { - Id uuid.UUID `bun:"id,type:uuid"` + Id string `bun:"name"` Provider string `bun:"provider_name,notnull"` MapperURL string `bun:"mapper_url" yaml:"mapper_url"` ClientId string `bun:"client_id,notnull" yaml:"client_id"`