Skip to content

Commit e2bd3b6

Browse files
Adjusted token admin to map to user ID. (#7341)
Closes #6131. * Adds a proxy model for Token that uses the user.pk, rather than it's own. * Adjusts Admin to map back from User ID to token instance.
1 parent b677b7b commit e2bd3b6

File tree

2 files changed

+56
-2
lines changed

2 files changed

+56
-2
lines changed

rest_framework/authtoken/admin.py

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,51 @@
11
from django.contrib import admin
2+
from django.contrib.admin.utils import quote
3+
from django.contrib.admin.views.main import ChangeList
4+
from django.contrib.auth import get_user_model
5+
from django.core.exceptions import ValidationError
6+
from django.urls import reverse
27

3-
from rest_framework.authtoken.models import Token
8+
from rest_framework.authtoken.models import Token, TokenProxy
9+
10+
User = get_user_model()
11+
12+
13+
class TokenChangeList(ChangeList):
14+
"""Map to matching User id"""
15+
def url_for_result(self, result):
16+
pk = result.user.pk
17+
return reverse('admin:%s_%s_change' % (self.opts.app_label,
18+
self.opts.model_name),
19+
args=(quote(pk),),
20+
current_app=self.model_admin.admin_site.name)
421

522

6-
@admin.register(Token)
723
class TokenAdmin(admin.ModelAdmin):
824
list_display = ('key', 'user', 'created')
925
fields = ('user',)
1026
ordering = ('-created',)
27+
actions = None # Actions not compatible with mapped IDs.
28+
29+
def get_changelist(self, request, **kwargs):
30+
return TokenChangeList
31+
32+
def get_object(self, request, object_id, from_field=None):
33+
"""
34+
Map from User ID to matching Token.
35+
"""
36+
queryset = self.get_queryset(request)
37+
field = User._meta.pk
38+
try:
39+
object_id = field.to_python(object_id)
40+
user = User.objects.get(**{field.name: object_id})
41+
return queryset.get(user=user)
42+
except (queryset.model.DoesNotExist, User.DoesNotExist, ValidationError, ValueError):
43+
return None
44+
45+
def delete_model(self, request, obj):
46+
# Map back to actual Token, since delete() uses pk.
47+
token = Token.objects.get(key=obj.key)
48+
return super().delete_model(request, token)
49+
50+
51+
admin.site.register(TokenProxy, TokenAdmin)

rest_framework/authtoken/models.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,16 @@ def generate_key(self):
3737

3838
def __str__(self):
3939
return self.key
40+
41+
42+
class TokenProxy(Token):
43+
"""
44+
Proxy mapping pk to user pk for use in admin.
45+
"""
46+
@property
47+
def pk(self):
48+
return self.user.pk
49+
50+
class Meta:
51+
proxy = True
52+
verbose_name = "token"

0 commit comments

Comments
 (0)