Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix token generation page

Roland Geider4cececbcaa8f
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 8e4474364..dc0cae164 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -71,6 +71,7 @@ from crispy_forms.layout import (
Row,
Submit
)
+from rest_framework.authtoken.models import Token
# wger
from wger.config.models import GymConfig
@@ -453,8 +454,13 @@ def api_key(request):
context = {}
context.update(csrf(request))
- token = create_token(request.user, request.GET.get('new_key'))
+ try:
+ token = Token.objects.get(user=request.user)
+ except Token.DoesNotExist:
+ token = None
+
if request.GET.get('new_key'):
+ token = create_token(request.user, request.GET.get('new_key'))
# Redirect to get rid of the GET parameter
return HttpResponseRedirect(reverse('core:user:api-key'))
diff --git a/wger/utils/api_token.py b/wger/utils/api_token.py
index 6b5f2a5f3..721994f7b 100644
--- a/wger/utils/api_token.py
+++ b/wger/utils/api_token.py
@@ -26,6 +26,7 @@ def create_token(user, force_new=False):
"""
Creates a new token for a user or returns the existing one.
+ :param user: User object
:param force_new: forces creating a new token
"""
token = False