strict typing checks for DRF types and attributes

api/tests/serializers_tests.py

@@ -1,3 +1,4 @@
+from django.contrib.auth.models import User
 from django.urls import reverse
 
 import pytest
@@ -12,14 +13,22 @@
 
 
 class PremiumValidatorsTest(APITestCase):
+    def _get_token_for_user(self, user: User) -> Token:
+        if not hasattr(Token, "objects"):
+            raise AttributeError("Token must have objects attribute.")
+        token = Token.objects.get(user=user)
+        if not isinstance(token, Token):
+            raise TypeError("token must be of type Token.")
+        return token
+
     def test_non_premium_cant_set_block_list_emails(self):
         free_user = make_free_test_user()
         free_alias = baker.make(RelayAddress, user=free_user)
         assert free_alias.block_list_emails is False
 
         url = reverse("relayaddress-detail", args=[free_alias.id])
         data = {"block_list_emails": True}
-        free_token = Token.objects.get(user=free_user)
+        free_token = self._get_token_for_user(free_user)
         self.client.credentials(HTTP_AUTHORIZATION="Token " + free_token.key)
         response = self.client.patch(url, data, format="json")
 
@@ -33,7 +42,7 @@ def test_non_premium_can_clear_block_list_emails(self):
 
         url = reverse("relayaddress-detail", args=[free_alias.id])
         data = {"block_list_emails": False}
-        free_token = Token.objects.get(user=free_user)
+        free_token = self._get_token_for_user(free_user)
         self.client.credentials(HTTP_AUTHORIZATION="Token " + free_token.key)
         response = self.client.patch(url, data, format="json")
 
@@ -48,7 +57,7 @@ def test_premium_can_set_block_list_emails(self):
 
         url = reverse("relayaddress-detail", args=[premium_alias.id])
         data = {"block_list_emails": True}
-        free_token = Token.objects.get(user=premium_user)
+        free_token = self._get_token_for_user(premium_user)
         self.client.credentials(HTTP_AUTHORIZATION="Token " + free_token.key)
         response = self.client.patch(url, data, format="json")
 

privaterelay/signals.py

@@ -91,6 +91,8 @@ def copy_auth_token(
     if created and instance is not None:
         # baker triggers created during tests
         # so first check the user doesn't already have a Token
+        if not hasattr(Token, "objects"):
+            raise AttributeError("Token must have objects attribute.")
         try:
             Token.objects.get(user=instance.user)
             return