Merge branch 'issue/django-setup-configuration-tokens' into issue/dja…

…ngo-setup-configuration-mozilla-django-oidc-db

src/objecttypes/setup_configuration/steps/token_auth.py

@@ -29,7 +29,7 @@ class TokenAuthConfigurationStep(
 
     def execute(self, model: TokenAuthGroupConfigurationModel) -> None:
         if len(model.items) == 0:
-            logger.warning(f"No tokens provided for configuration")
+            logger.warning("No tokens provided for configuration")
 
         for item in model.items:
             logger.info(f"Configuring {item.identifier}")

src/objecttypes/token/migrations/0009_tokenauth_identifier_alter_tokenauth_token.py

@@ -59,7 +59,10 @@ class Migration(migrations.Migration):
             field=models.CharField(
                 max_length=40,
                 unique=True,
-                validators=[objecttypes.token.validators.validate_no_whitespace],
+                validators=[
+                    objecttypes.token.validators.validate_no_empty,
+                    objecttypes.token.validators.validate_no_whitespace,
+                ],
                 verbose_name="token",
             ),
         ),

src/objecttypes/token/models.py

@@ -3,7 +3,7 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from objecttypes.token.validators import validate_no_whitespace, validate_no_empty
+from objecttypes.token.validators import validate_no_empty, validate_no_whitespace
 
 
 class TokenAuth(models.Model):

src/objecttypes/token/tests/test_validators.py

@@ -1,7 +1,20 @@
 from django.core.exceptions import ValidationError
 from django.test import SimpleTestCase
 
-from objecttypes.token.validators import validate_no_whitespace, validate_no_empty
+from objecttypes.token.validators import validate_no_empty, validate_no_whitespace
+
+
+class NoEmptyValidatorTestCase(SimpleTestCase):
+    def test_valid(self):
+        self.assertIsNone(validate_no_empty("test123"))
+
+    def test_invalid_string(self):
+        with self.assertRaises(ValidationError):
+            validate_no_empty("")
+
+    def test_invalid_none(self):
+        with self.assertRaises(ValidationError):
+            validate_no_empty(None)
 
 
 class NoEmptyValidatorTestCase(SimpleTestCase):