diff --git a/apps/downloads/tests/test_views.py b/apps/downloads/tests/test_views.py index a070d499f..f7f86129c 100644 --- a/apps/downloads/tests/test_views.py +++ b/apps/downloads/tests/test_views.py @@ -4,6 +4,7 @@ from django.contrib.auth import get_user_model from django.test import TestCase, override_settings from django.urls import reverse +from rest_framework.authtoken.models import Token from rest_framework.test import APITestCase from apps.downloads.models import ( @@ -179,7 +180,8 @@ def setUp(self): password="passworduser", is_staff=True, ) - self.Authorization = f"Token {self.staff_user.api_v2_token}" + token = Token.objects.get(user=self.staff_user) + self.Authorization = f"Token {token.key}" self.Authorization_invalid = "Token invalid-token" def get_json(self, response): diff --git a/apps/users/models.py b/apps/users/models.py index 3d67fef5b..b2eda9c6e 100644 --- a/apps/users/models.py +++ b/apps/users/models.py @@ -8,7 +8,6 @@ from django.urls import reverse from django.utils import timezone from markupfield.fields import MarkupField -from rest_framework.authtoken.models import Token from tastypie.models import create_api_key from apps.users.managers import UserManager @@ -73,14 +72,6 @@ def sponsorships(self): return Sponsorship.objects.visible_to(self) - @property - def api_v2_token(self): - """Return the user's DRF API token key, or empty string if none exists.""" - try: - return Token.objects.get(user=self).key - except Token.DoesNotExist: - return "" - models.signals.post_save.connect(create_api_key, sender=User)