diff --git a/docker/setup_configuration/data.yaml b/docker/setup_configuration/data.yaml index 172e2446..3c9d9c35 100644 --- a/docker/setup_configuration/data.yaml +++ b/docker/setup_configuration/data.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: token-1 token: ba9d233e95e04c4a8a661a27daffe7c9bd019067 diff --git a/docs/installation/setup_configuration.rst b/docs/installation/setup_configuration.rst index b699db43..bf65f2e5 100644 --- a/docs/installation/setup_configuration.rst +++ b/docs/installation/setup_configuration.rst @@ -31,8 +31,8 @@ Create a (single) YAML configuration file with your settings: .. code-block:: yaml - openklant_tokens_config_enable: true - openklant_tokens: + tokenauth_config_enable: true + tokenauth: items: - identifier: token-1 token: ba9d233e95e04c4a8a661a27daffe7c9bd019067 diff --git a/src/openklant/setup_configuration/models.py b/src/openklant/setup_configuration/models.py index 07aca66e..7d768d71 100644 --- a/src/openklant/setup_configuration/models.py +++ b/src/openklant/setup_configuration/models.py @@ -1,5 +1,4 @@ from django_setup_configuration.models import ConfigurationModel -from pydantic import Field from openklant.components.token.models import TokenAuth @@ -20,4 +19,4 @@ class Meta: class TokenAuthGroupConfigurationModel(ConfigurationModel): - items: list[TokenAuthConfigurationModel] = Field() + items: list[TokenAuthConfigurationModel] diff --git a/src/openklant/setup_configuration/steps.py b/src/openklant/setup_configuration/steps.py index ce393b55..3a3df41e 100644 --- a/src/openklant/setup_configuration/steps.py +++ b/src/openklant/setup_configuration/steps.py @@ -19,8 +19,8 @@ class TokenAuthConfigurationStep( Configure configuration groups for the Objects API backend """ - namespace = "openklant_tokens" - enable_setting = "openklant_tokens_config_enable" + namespace = "tokenauth" + enable_setting = "tokenauth_config_enable" verbose_name = "Configuration to set up authentication tokens for Open Klant" config_model = TokenAuthGroupConfigurationModel diff --git a/src/openklant/setup_configuration/tests/files/token_all_fields.yaml b/src/openklant/setup_configuration/tests/files/token_all_fields.yaml index 64079bde..3307169b 100644 --- a/src/openklant/setup_configuration/tests/files/token_all_fields.yaml +++ b/src/openklant/setup_configuration/tests/files/token_all_fields.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: token-1 token: 18b2b74ef994314b84021d47b9422e82b685d82f diff --git a/src/openklant/setup_configuration/tests/files/token_empty_database.yaml b/src/openklant/setup_configuration/tests/files/token_empty_database.yaml index a595fb49..a700b176 100644 --- a/src/openklant/setup_configuration/tests/files/token_empty_database.yaml +++ b/src/openklant/setup_configuration/tests/files/token_empty_database.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: token-1 token: 7b2b212d9f16d171a70a1d927cdcfbd5ca7a4799 diff --git a/src/openklant/setup_configuration/tests/files/token_existing_tokens.yaml b/src/openklant/setup_configuration/tests/files/token_existing_tokens.yaml index 5a70fc9b..22099cf1 100644 --- a/src/openklant/setup_configuration/tests/files/token_existing_tokens.yaml +++ b/src/openklant/setup_configuration/tests/files/token_existing_tokens.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: token-1 token: 18b2b74ef994314b84021d47b9422e82b685d82f diff --git a/src/openklant/setup_configuration/tests/files/token_idempotent.yaml b/src/openklant/setup_configuration/tests/files/token_idempotent.yaml index a6971382..a6ca1380 100644 --- a/src/openklant/setup_configuration/tests/files/token_idempotent.yaml +++ b/src/openklant/setup_configuration/tests/files/token_idempotent.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: token-1 token: 7b2b212d9f16d171a70a1d927cdcfbd5ca7a4799 diff --git a/src/openklant/setup_configuration/tests/files/token_invalid_email.yaml b/src/openklant/setup_configuration/tests/files/token_invalid_email.yaml index c271b37a..559f391f 100644 --- a/src/openklant/setup_configuration/tests/files/token_invalid_email.yaml +++ b/src/openklant/setup_configuration/tests/files/token_invalid_email.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: token-1 token: ba9d233e95e04c4a8a661a27daffe7c9bd019067 diff --git a/src/openklant/setup_configuration/tests/files/token_invalid_identifier.yaml b/src/openklant/setup_configuration/tests/files/token_invalid_identifier.yaml index 0714f399..37aa8b27 100644 --- a/src/openklant/setup_configuration/tests/files/token_invalid_identifier.yaml +++ b/src/openklant/setup_configuration/tests/files/token_invalid_identifier.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar token: ba9d233e95e04c4a8a661a27daffe7c9bd019067 diff --git a/src/openklant/setup_configuration/tests/files/token_invalid_token.yaml b/src/openklant/setup_configuration/tests/files/token_invalid_token.yaml index e81d4f68..67bbeea0 100644 --- a/src/openklant/setup_configuration/tests/files/token_invalid_token.yaml +++ b/src/openklant/setup_configuration/tests/files/token_invalid_token.yaml @@ -1,5 +1,5 @@ -openklant_tokens_config_enable: true -openklant_tokens: +tokenauth_config_enable: true +tokenauth: items: - identifier: token-1 token: foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar foobar