Selaa lähdekoodia

refactor(api): minor code cleanup

Peter Thomassen 4 vuotta sitten
vanhempi
commit
269fe129de
3 muutettua tiedostoa jossa 4 lisäystä ja 9 poistoa
  1. 1 4
      api/desecapi/models.py
  2. 0 2
      api/desecapi/tests/test_tokens.py
  3. 3 3
      api/desecapi/views.py

+ 1 - 4
api/desecapi/models.py

@@ -414,10 +414,7 @@ class Token(ExportModelOperationsMixin('Token'), rest_framework.authtoken.models
 
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     key = models.CharField("Key", max_length=128, db_index=True, unique=True)
-    user = models.ForeignKey(
-        User, related_name='auth_tokens',
-        on_delete=models.CASCADE, verbose_name="User"
-    )
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
     name = models.CharField('Name', blank=True, max_length=64)
     last_used = models.DateTimeField(null=True, blank=True)
     perm_manage_tokens = models.BooleanField(default=False)

+ 0 - 2
api/desecapi/tests/test_tokens.py

@@ -1,5 +1,3 @@
-from ipaddress import IPv4Network
-
 from rest_framework import status
 
 from desecapi.models import Token

+ 3 - 3
api/desecapi/views.py

@@ -98,7 +98,7 @@ class TokenViewSet(IdempotentDestroyMixin, viewsets.ModelViewSet):
     throttle_scope = 'account_management_passive'
 
     def get_queryset(self):
-        return self.request.user.auth_tokens.all()
+        return self.request.user.token_set.all()
 
     def get_serializer(self, *args, **kwargs):
         # When creating a new token, return the plaintext representation
@@ -263,7 +263,7 @@ class RRsetList(EmptyPayloadMixin, DomainViewMixin, generics.ListCreateAPIView,
 
 
 class Root(APIView):
-    def get(self, request, *_):
+    def get(self, request, *args, **kwargs):
         if self.request.user.is_authenticated:
             routes = {
                 'account': {
@@ -378,7 +378,7 @@ class DynDNS12UpdateView(generics.GenericAPIView):
     def get_queryset(self):
         return self.domain.rrset_set.filter(subname=self.subname, type__in=['A', 'AAAA'])
 
-    def get(self, request, *_):
+    def get(self, request, *args, **kwargs):
         instances = self.get_queryset().all()
 
         ipv4 = self._find_ip(['myip', 'myipv4', 'ip'], version=4)