Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix login api error
Roland Geider843a8474f2ed
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex d72c94cb6..5c9e7861f 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -1,5 +1,3 @@-# -*- coding: utf-8 -*--# This file is part of wger Workout Manager.## wger Workout Manager is free software: you can redistribute it and/or modify@@ -15,12 +13,18 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.+# Standard Library+import logging+# Django+from django.contrib.auth import authenticatefrom django.contrib.auth.models import Userfrom django.contrib.auth.password_validation import validate_password+from django.http import HttpRequest# Third Partyfrom rest_framework import serializers+from rest_framework.fields import emptyfrom rest_framework.validators import UniqueValidator# wger@@ -34,6 +38,9 @@ from wger.core.models import ()+logger = logging.getLogger(__name__)++class UserprofileSerializer(serializers.ModelSerializer):"""Workout session serializer@@ -78,14 +85,39 @@ class UserprofileSerializer(serializers.ModelSerializer):]-class UserApiSerializer(serializers.ModelSerializer):+class UserLoginSerializer(serializers.ModelSerializer):""" Serializer to map to User model in relation to api user"""- username = serializers.CharField(required=True)+ email = serializers.CharField(required=False)+ username = serializers.CharField(required=False)password = serializers.CharField(required=True, min_length=8)+ request: HttpRequest+class Meta:model = User- fields = ['username', 'password']+ fields = ['username', 'password', 'email']++ def __init__(self, request: HttpRequest, instance=None, data=empty, **kwargs):+ self.request = request+ super().__init__(instance, data, **kwargs)++ def validate(self, data):+ email = data.get("email", None)+ username = data.get("username", None)+ password = data.get("password", None)++ if email is None and username is None:+ raise serializers.ValidationError('Please provide an "email" or a "username"')++ user_username = authenticate(request=self.request, username=username, password=password)+ user_email = authenticate(request=self.request, username=email, password=password)+ user = user_username or user_email++ if user is None:+ logger.info(f"Tried logging via API with unknown user: '{username}'")+ raise serializers.ValidationError('Username or password unknown')++ return dataclass UserRegistrationSerializer(serializers.ModelSerializer):diff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex 73dcada11..9bd34dc6a 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -59,8 +59,8 @@ from wger.core.api.serializers import (LanguageSerializer,LicenseSerializer,RepetitionUnitSerializer,+ UserLoginSerializer,RoutineWeightUnitSerializer,- UserApiSerializer,UserprofileSerializer,UserRegistrationSerializer,)@@ -252,42 +252,35 @@ class UserAPILoginView(viewsets.ViewSet):"""permission_classes = (AllowAny, )queryset = User.objects.all()- serializer_class = UserApiSerializer+ serializer_class = UserLoginSerializerthrottle_scope = 'login'def get(self, request):- return Response(- data={- 'message': "You must send a 'username' and 'password' via POST",- 'warning': "This endpoint is deprecated."- },- headers={- "Deprecation": "Sat, 01 Oct 2022 23:59:59 GMT",- },- )+ return Response(data={'message': "You must send a 'username' and 'password' via POST"})- @staticmethod@extend_schema(parameters=[],responses={status.HTTP_200_OK:- inline_serializer(- name='loginSerializer',- fields={'token': CharField()},- ),+ inline_serializer(+ name='loginSerializer',+ fields={'token': CharField()},+ ),})def post(self, request):- data = request.data- serializer = self.serializer_class(data=data)+ serializer = self.serializer_class(data=request.data, request=request)serializer.is_valid(raise_exception=True)- username = serializer.data["username"]- # Try to retrieve the user- form = UserLoginForm(data=serializer.data, authenticate_on_clean=False)+ # This is a bit hacky, but saving the email or username as the username+ # allows us to simply use the helpers.EmailAuthBackend backend which also+ # uses emails+ username = serializer.data.get('username', serializer.data.get('email', None))+ data = {'username': username, 'password': serializer.data['password']}+ form = UserLoginForm(data=data, authenticate_on_clean=False)if not form.is_valid():- logger.info(f"Tried logging via API with unknown user: '{username}'")+ logger.info(f"Tried logging via API with unknown user : '{username}'")return Response({'detail': 'Username or password unknown'},status=status.HTTP_401_UNAUTHORIZED,@@ -296,10 +289,11 @@ class UserAPILoginView(viewsets.ViewSet):form.authenticate(request)token = create_token(form.get_user())return Response(- data={- 'token': token.key,- },+ data={'token': token.key},status=status.HTTP_200_OK,+ headers={+ "Deprecation": "Sat, 01 Oct 2022 23:59:59 GMT",+ })diff --git a/wger/core/models/profile.py b/wger/core/models/profile.pyindex 8edda7b73..ba7ca646f 100644--- a/wger/core/models/profile.py+++ b/wger/core/models/profile.py@@ -523,8 +523,8 @@ by the US Department of Agriculture. It is extremely complete, with around"""if (not WeightEntry.objects.filter(user=self.user).exists() or (- datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date- > datetime.timedelta(days=3)+ datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date >+ datetime.timedelta(days=3))):entry = WeightEntry()diff --git a/wger/core/tests/test_user_login.py b/wger/core/tests/test_user_login.pyindex f0db2db38..8d8da67db 100644--- a/wger/core/tests/test_user_login.py+++ b/wger/core/tests/test_user_login.py@@ -1,8 +1,16 @@# Standard Libraryfrom unittest import mock+# Third Party+from rest_framework import status+from rest_framework.exceptions import ErrorDetail+# wger-from wger.core.tests.base_testcase import WgerTestCase+from wger.core.tests.api_base_test import ApiBaseTestCase+from wger.core.tests.base_testcase import (+ BaseTestCase,+ WgerTestCase,+)from wger.core.views.user import trainer_login@@ -69,3 +77,75 @@ class TrainerLoginTestCase(WgerTestCase):resp = trainer_login(request, 'primary-key-not-needed-because-of-mock')self.assertEqual(404, resp.status_code)+++class UserApiLoginApiTestCase(BaseTestCase, ApiBaseTestCase):+ url = '/api/v2/login/'++ def test_access_logged_out(self):+ """+ Logged-out users are also allowed to use the search+ """+ response = self.client.get(self.url)+ self.assertEqual(response.status_code, status.HTTP_200_OK)++ def test_login_username_success(self):+ response = self.client.post(+ self.url,+ {+ 'username': 'admin',+ 'password': 'adminadmin'+ },+ )+ result = response.data++ self.assertEqual(response.status_code, status.HTTP_200_OK)+ self.assertEqual(result, {'token': 'apikey-admin'})++ def test_login_username_fail(self):+ response = self.client.post(self.url, {'username': 'admin', 'password': 'adminadmin123'})+ result = response.data++ self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)+ self.assertEqual(+ result['non_field_errors'],+ [ErrorDetail(string='Username or password unknown', code='invalid')]+ )++ def test_login_email_success(self):+ response = self.client.post(+ self.url,+ {+ 'email': '[email protected]',+ 'password': 'adminadmin'+ },+ )+ result = response.data++ self.assertEqual(response.status_code, status.HTTP_200_OK)+ self.assertEqual(result, {'token': 'apikey-admin'})++ def test_login_email_fail(self):+ response = self.client.post(+ self.url, {+ 'email': '[email protected]',+ 'password': 'adminadmin123'+ }+ )+ result = response.data++ self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)+ self.assertEqual(+ result['non_field_errors'],+ [ErrorDetail(string='Username or password unknown', code='invalid')]+ )++ def test_no_parameters(self):+ response = self.client.post(self.url, {'foo': 'bar', 'password': 'adminadmin123'})+ result = response.data++ self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)+ self.assertEqual(+ result['non_field_errors'],+ [ErrorDetail(string='Please provide an "email" or a "username"', code='invalid')]+ )