mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 05:07:31 +00:00
feat: restrict languages (#6931)
* feat: return 404 or 409 if org reg disallowed * fix: system limit permissions * feat: add iam limits api * feat: disallow public org registrations on default instance * add integration test * test: integration * fix test * docs: describe public org registrations * avoid updating docs deps * fix system limits integration test * silence integration tests * fix linting * ignore strange linter complaints * review * improve reset properties naming * redefine the api * use restrictions aggregate * test query * simplify and test projection * test commands * fix unit tests * move integration test * support restrictions on default instance * also test GetRestrictions * self review * lint * abstract away resource owner * fix tests * configure supported languages * fix allowed languages * fix tests * default lang must not be restricted * preferred language must be allowed * change preferred languages * check languages everywhere * lint * test command side * lint * add integration test * add integration test * restrict supported ui locales * lint * lint * cleanup * lint * allow undefined preferred language * fix integration tests * update main * fix env var * ignore linter * ignore linter * improve integration test config * reduce cognitive complexity * compile * check for duplicates * remove useless restriction checks * review * revert restriction renaming * fix language restrictions * lint * generate * allow custom texts for supported langs for now * fix tests * cleanup * cleanup * cleanup * lint * unsupported preferred lang is allowed * fix integration test * finish reverting to old property name * finish reverting to old property name * load languages * refactor(i18n): centralize translators and fs * lint * amplify no validations on preferred languages * fix integration test * lint * fix resetting allowed languages * test unchanged restrictions
This commit is contained in:
@@ -3,6 +3,7 @@ package projection
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
old_handler "github.com/zitadel/zitadel/internal/eventstore/handler"
|
||||
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
||||
@@ -21,6 +22,7 @@ const (
|
||||
RestrictionsColumnSequence = "sequence"
|
||||
|
||||
RestrictionsColumnDisallowPublicOrgRegistration = "disallow_public_org_registration"
|
||||
RestrictionsColumnAllowedLanguages = "allowed_languages"
|
||||
)
|
||||
|
||||
type restrictionsProjection struct{}
|
||||
@@ -42,7 +44,8 @@ func (*restrictionsProjection) Init() *old_handler.Check {
|
||||
handler.NewColumn(RestrictionsColumnResourceOwner, handler.ColumnTypeText),
|
||||
handler.NewColumn(RestrictionsColumnInstanceID, handler.ColumnTypeText),
|
||||
handler.NewColumn(RestrictionsColumnSequence, handler.ColumnTypeInt64),
|
||||
handler.NewColumn(RestrictionsColumnDisallowPublicOrgRegistration, handler.ColumnTypeBool),
|
||||
handler.NewColumn(RestrictionsColumnDisallowPublicOrgRegistration, handler.ColumnTypeBool, handler.Nullable()),
|
||||
handler.NewColumn(RestrictionsColumnAllowedLanguages, handler.ColumnTypeTextArray, handler.Nullable()),
|
||||
},
|
||||
handler.NewPrimaryKey(RestrictionsColumnInstanceID, RestrictionsColumnResourceOwner),
|
||||
),
|
||||
@@ -89,8 +92,11 @@ func (p *restrictionsProjection) reduceRestrictionsSet(event eventstore.Event) (
|
||||
handler.NewCol(RestrictionsColumnSequence, e.Sequence()),
|
||||
handler.NewCol(RestrictionsColumnAggregateID, e.Aggregate().ID),
|
||||
}
|
||||
if e.DisallowPublicOrgRegistrations != nil {
|
||||
updateCols = append(updateCols, handler.NewCol(RestrictionsColumnDisallowPublicOrgRegistration, *e.DisallowPublicOrgRegistrations))
|
||||
if e.DisallowPublicOrgRegistration != nil {
|
||||
updateCols = append(updateCols, handler.NewCol(RestrictionsColumnDisallowPublicOrgRegistration, *e.DisallowPublicOrgRegistration))
|
||||
}
|
||||
if e.AllowedLanguages != nil {
|
||||
updateCols = append(updateCols, handler.NewCol(RestrictionsColumnAllowedLanguages, domain.LanguagesToStrings(*e.AllowedLanguages)))
|
||||
}
|
||||
return handler.NewUpsertStatement(e, conflictCols, updateCols), nil
|
||||
}
|
||||
|
@@ -25,7 +25,7 @@ func TestRestrictionsProjection_reduces(t *testing.T) {
|
||||
event: getEvent(testEvent(
|
||||
restrictions.SetEventType,
|
||||
restrictions.AggregateType,
|
||||
[]byte(`{ "disallowPublicOrgRegistrations": true }`),
|
||||
[]byte(`{ "disallowPublicOrgRegistration": true }`),
|
||||
), restrictions.SetEventMapper),
|
||||
},
|
||||
reduce: (&restrictionsProjection{}).reduceRestrictionsSet,
|
||||
|
Reference in New Issue
Block a user