Merge branch 'master' into new-eventstore

# Conflicts:
#	go.mod
#	internal/admin/repository/eventsourcing/eventstore/iam.go
#	internal/authz/repository/eventsourcing/repository.go
#	internal/eventstore/eventstore.go
#	internal/setup/config.go
#	pkg/grpc/management/mock/management.proto.mock.go
This commit is contained in:
Livio Amstutz
2021-01-05 09:27:42 +01:00
283 changed files with 7264 additions and 2500 deletions

View File

@@ -67,7 +67,7 @@ export ZITADEL_SHORT_CACHE_SHARED_MAXAGE=15m
export ZITADEL_CONSOLE_ENV_DIR=../../console/src/assets/
#Org
export ZITADEL_DEFAULT_DOMAIN=zitadel.ch
export ZITADEL_DEFAULT_DOMAIN=localhost
#Setup

View File

@@ -98,4 +98,6 @@ SetUp:
Step7:
DefaultSecondFactor: 1 #SecondFactorTypeOTP
Step8:
DefaultSecondFactor: 2 #SecondFactorTypeU2F
DefaultSecondFactor: 2 #SecondFactorTypeU2F
Step9:
Passwordless: true

View File

@@ -49,11 +49,11 @@ AuthZ:
Key: $CR_AUTHZ_KEY
Spooler:
ConcurrentWorkers: 1
BulkLimit: 100
BulkLimit: 10000
FailureCountUntilSkip: 5
Auth:
SearchLimit: 100
SearchLimit: 1000
Domain: $ZITADEL_DEFAULT_DOMAIN
Eventstore:
ServiceName: 'authAPI'
@@ -98,7 +98,7 @@ Auth:
Key: $CR_AUTH_KEY
Spooler:
ConcurrentWorkers: 1
BulkLimit: 100
BulkLimit: 10000
FailureCountUntilSkip: 5
KeyConfig:
Size: 2048
@@ -109,7 +109,7 @@ Auth:
SigningKeyRotation: 10s
Admin:
SearchLimit: 100
SearchLimit: 1000
Domain: $ZITADEL_DEFAULT_DOMAIN
Eventstore:
ServiceName: 'Admin'
@@ -142,11 +142,11 @@ Admin:
Key: $CR_ADMINAPI_KEY
Spooler:
ConcurrentWorkers: 1
BulkLimit: 100
BulkLimit: 10000
FailureCountUntilSkip: 5
Mgmt:
SearchLimit: 100
SearchLimit: 1000
Domain: $ZITADEL_DEFAULT_DOMAIN
Eventstore:
ServiceName: 'ManagementAPI'
@@ -179,7 +179,7 @@ Mgmt:
Key: $CR_MANAGEMENT_KEY
Spooler:
ConcurrentWorkers: 1
BulkLimit: 100
BulkLimit: 10000
FailureCountUntilSkip: 5
API:
@@ -292,10 +292,6 @@ Notification:
Key: $CR_NOTIFICATION_KEY
Spooler:
ConcurrentWorkers: 1
BulkLimit: 100
BulkLimit: 10000
FailureCountUntilSkip: 5
Handlers:
Notification:
MinimumCycleDuration: 5s
User:
MinimumCycleDuration: 5s
Handlers:

View File

@@ -126,7 +126,7 @@ SystemDefaults:
Text: 'DomainClaimed.Text'
ButtonText: 'DomainClaimed.ButtonText'
WebAuthN:
ID: $ZITADEL_COOKIE_DOMAIN
ID: $ZITADEL_DEFAULT_DOMAIN
OriginLogin: $ZITADEL_ACCOUNTS
OriginConsole: $ZITADEL_CONSOLE
DisplayName: ZITADEL