TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: restrict languages (#6931)

Browse Source 
* 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:
Elio Bischof
2023-12-05 12:12:01 +01:00
committed by GitHub
parent 236930f109
commit dd33538c0a
123 changed files with 4133 additions and 2058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
internal/command/org_custom_message_text_test.go
View File

@@ -8,7 +8,7 @@ import (
"golang.org/x/text/language"
"github.com/zitadel/zitadel/internal/domain"
caos_errs "github.com/zitadel/zitadel/internal/errors"
zitadel_errs "github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/org"
)
@@ -35,32 +35,83 @@ func TestCommandSide_SetCustomMessageText(t *testing.T) {
{
name: "no resource owner, error",
fields: fields{
eventstore: eventstoreExpect(
t,
),
eventstore: eventstoreExpect(t),
},
args: args{
ctx: context.Background(),
config: &domain.CustomMessageText{},
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zitadel_errs.IsErrorInvalidArgument,
},
},
{
name: "invalid custom text, error",
name: "empty message type, error",
fields: fields{
eventstore: eventstoreExpect(t),
},
args: args{
ctx: context.Background(),
resourceOwner: "org1",
config: &domain.CustomMessageText{
Language: AllowedLanguage,
},
},
res: res{
err: zitadel_errs.IsErrorInvalidArgument,
},
},
{
name: "empty custom message text, success",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(),
expectPush(),
),
},
args: args{
ctx: context.Background(),
resourceOwner: "org1",
config: &domain.CustomMessageText{
MessageTextType: "Some type", // TODO: check the type!
Language: AllowedLanguage,
},
},
res: res{
want: &domain.ObjectDetails{
ResourceOwner: "org1",
},
},
},
{
name: "undefined language, error",
fields: fields{
eventstore: eventstoreExpect(t),
},
args: args{
ctx: context.Background(),
resourceOwner: "org1",
config: &domain.CustomMessageText{},
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zitadel_errs.IsErrorInvalidArgument,
},
},
{
name: "unsupported language, error",
fields: fields{
eventstore: eventstoreExpect(t),
},
args: args{
ctx: context.Background(),
resourceOwner: "org1",
config: &domain.CustomMessageText{
Language: UnsupportedLanguage,
},
},
res: res{
err: zitadel_errs.IsErrorInvalidArgument,
},
},
{
@@ -345,7 +396,7 @@ func TestCommandSide_RemoveCustomMessageText(t *testing.T) {
lang: language.English,
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zitadel_errs.IsErrorInvalidArgument,
},
},
{
@@ -361,7 +412,7 @@ func TestCommandSide_RemoveCustomMessageText(t *testing.T) {
lang: language.English,
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zitadel_errs.IsErrorInvalidArgument,
},
},
{
@@ -377,7 +428,7 @@ func TestCommandSide_RemoveCustomMessageText(t *testing.T) {
mailTextType: "Template",
},
res: res{
err: caos_errs.IsErrorInvalidArgument,
err: zitadel_errs.IsErrorInvalidArgument,
},
},
{
@@ -471,6 +522,43 @@ func TestCommandSide_RemoveCustomMessageText(t *testing.T) {
},
},
},
{
name: "remove unsupported language ok, especially because we never validated whether a language is supported in previous ZITADEL versions",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(
eventFromEventPusher(
org.NewCustomTextSetEvent(context.Background(),
&org.NewAggregate("org1").Aggregate,
"Template",
domain.MessageGreeting,
"Greeting",
UnsupportedLanguage,
),
),
),
expectPush(
org.NewCustomTextTemplateRemovedEvent(context.Background(),
&org.NewAggregate("org1").Aggregate,
"Template",
UnsupportedLanguage,
),
),
),
},
args: args{
ctx: context.Background(),
resourceOwner: "org1",
mailTextType: "Template",
lang: UnsupportedLanguage,
},
res: res{
want: &domain.ObjectDetails{
ResourceOwner: "org1",
},
},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {