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

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

INSTALL.rst

@@ -276,12 +276,14 @@ There are no specific commands for the project. See
 .. _Django framework commands: https://docs.djangoproject.com/en/dev/ref/django-admin/#available-commands
 
 Configuration (CLI)
-========
+===================
 
-After deploying Objecttypes API, they need to be configured to be fully functional. The command line tool setup_configuration assist with this configuration:
+After deploying Objecttypes API, they need to be configured to be fully functional.
+The command line tool ``setup_configuration`` assist with this configuration.
 
 You can get the full command documentation with:
 
-.. code-block:: bash
+See `Django Setup Configuration`_ for all documentation, or type
+``python src/manage.py setup_configuration --help``.
 
-    python src/manage.py setup_configuration --help
+.. _Django Setup Configuration: https://github.com/maykinmedia/django-setup-configuration

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

@@ -59,7 +59,7 @@ class Migration(migrations.Migration):
             field=models.CharField(
                 max_length=40,
                 unique=True,
-                validators=[objecttypes.token.validators.validate_whitespace],
+                validators=[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_whitespace
+from objecttypes.token.validators import validate_no_whitespace
 
 
 class TokenAuth(models.Model):
@@ -16,7 +16,7 @@ class TokenAuth(models.Model):
         _("token"),
         max_length=40,
         unique=True,
-        validators=[validate_whitespace],
+        validators=[validate_no_whitespace],
     )
 
     contact_person = models.CharField(

src/objecttypes/token/tests/test_authenticaton.py

@@ -19,7 +19,33 @@ def test_valid_token(self):
         )
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-    def test_invalid_token(self):
+    def test_valid_token_with_no_spaces(self):
+        token_auth = TokenAuth.objects.create(
+            contact_person="contact_person",
+            email="[email protected]",
+            identifier="token-1",
+            token="1234-Token-5678",
+        )
+        response = self.client.get(
+            reverse("v2:objecttype-list"),
+            HTTP_AUTHORIZATION=f"Token {token_auth.token}",
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+    def test_invalid_token_with_spaces(self):
+        token_auth = TokenAuth.objects.create(
+            contact_person="contact_person",
+            email="[email protected]",
+            identifier="token-1",
+            token="1234 Token 5678",
+        )
+        response = self.client.get(
+            reverse("v2:objecttype-list"),
+            HTTP_AUTHORIZATION=f"Token {token_auth.token}",
+        )
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
+
+    def test_invalid_token_existing(self):
         response = self.client.get(
             reverse("v2:objecttype-list"),
             HTTP_AUTHORIZATION="Token 1234-Token-5678",
@@ -28,7 +54,7 @@ def test_invalid_token(self):
 
     def test_empty_token(self):
         response = self.client.get(
-            reverse("v2:objecttype-list"), HTTP_AUTHORIZATION="Token"
+            reverse("v2:objecttype-list"), HTTP_AUTHORIZATION="Token "
         )
         self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
 

src/objecttypes/token/tests/test_validators.py

@@ -1,45 +1,41 @@
 from django.core.exceptions import ValidationError
 from django.test import SimpleTestCase
 
-from objecttypes.token.validators import validate_whitespace
+from objecttypes.token.validators import validate_no_whitespace
 
 
 class WhiteSpaceValidatorTestCase(SimpleTestCase):
     def test_characters_only(self):
-        self.assertIsNone(validate_whitespace("test123"))
+        self.assertIsNone(validate_no_whitespace("test123"))
 
     def test_trailing_whitespace(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("test123  ")
+            validate_no_whitespace("test123  ")
 
     def test_leading_whitespace(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("  test123")
+            validate_no_whitespace("  test123")
 
     def test_whitespace_in_between(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("test  123")
+            validate_no_whitespace("test  123")
 
     def test_whitespace_only(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("  ")
+            validate_no_whitespace("  ")
 
     def test_trailing_tab_character(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("test123\t")
+            validate_no_whitespace("test123\t")
 
     def test_leading_tab_character(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("\ttest123")
+            validate_no_whitespace("\ttest123")
 
     def test_tab_character_in_between(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("test\t123")
+            validate_no_whitespace("test\t123")
 
     def test_tab_characters_only(self):
         with self.assertRaises(ValidationError):
-            validate_whitespace("\t\t")
-
-    def test_blank_value(self):
-        with self.assertRaises(ValidationError):
-            validate_whitespace("")
+            validate_no_whitespace("\t\t")

src/objecttypes/token/validators.py

@@ -7,10 +7,7 @@
 WHITESPACE_PATTERN = re.compile(r".*\s.*")
 
 
-def validate_whitespace(value: str) -> None:
-    if not value:
-        raise ValidationError(code="invalid", message=_("Blank values are not allowed"))
-
+def validate_no_whitespace(value: str) -> None:
     if WHITESPACE_PATTERN.match(value):
         raise ValidationError(
             code="all-whitespace",