Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove the /api/v2/login endpoint

Roland Geidera88b556365b2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce7cdd5a7..bffe0bd01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,12 @@ to UUID. This was made to allow for clients to generate IDs locally and affects
Make sure you have set the values for `SITE_URL`.
+
+**`/api/v2/login/` endpoint removed.** This endpoint returned a permanent token
+If you want to generate a new token, visit the "API key" page in the user settings
+and paste it into scripts.
+
+
## Others
* The ingredient API filter now supports range lookups on `nutriscore`
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index 8055c28c4..72065f016 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -17,16 +17,13 @@
import logging
# Django
-from django.contrib.auth import authenticate
from django.contrib.auth.models import User
from django.contrib.auth.password_validation import validate_password
-from django.http import HttpRequest
# Third Party
from allauth.account.utils import filter_users_by_email
from lingua import LanguageDetectorBuilder
from rest_framework import serializers
-from rest_framework.fields import empty
from rest_framework.validators import UniqueValidator
# wger
@@ -91,42 +88,6 @@ class UserprofileSerializer(serializers.ModelSerializer):
)
-class UserLoginSerializer(serializers.ModelSerializer):
- """Serializer to map to User model in relation to api user"""
-
- email = serializers.EmailField(required=False)
- username = serializers.CharField(required=False)
- password = serializers.CharField(required=True, min_length=8)
-
- request: HttpRequest
-
- class Meta:
- model = User
- fields = ('username', 'password', 'email')
-
- def __init__(self, request: HttpRequest = None, 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 data
-
-
class UserRegistrationSerializer(serializers.ModelSerializer):
email = serializers.EmailField(required=False)
username = serializers.CharField(
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 0fc15a509..519c20f53 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -71,11 +71,9 @@ from wger.core.api.serializers import (
LicenseSerializer,
RepetitionUnitSerializer,
RoutineWeightUnitSerializer,
- UserLoginSerializer,
UserprofileSerializer,
UserRegistrationSerializer,
)
-from wger.core.forms import UserLoginForm
from wger.core.models import (
Language,
License,
@@ -272,59 +270,6 @@ class RequiredServerVersionView(viewsets.ViewSet):
return Response(str(MIN_SERVER_VERSION))
-class UserAPILoginView(viewsets.ViewSet):
- """
- API login endpoint. Returns a token that can subsequently passed in the
- header.
-
- Note that it is recommended to use token authorization instead.
- """
-
- permission_classes = (AllowAny,)
- queryset = User.objects.all()
- serializer_class = UserLoginSerializer
- throttle_scope = 'login'
-
- def get(self, request):
- return Response(data={'message': "You must send a 'username' and 'password' via POST"})
-
- @extend_schema(
- parameters=[],
- responses={
- status.HTTP_200_OK: inline_serializer(
- name='loginSerializer',
- fields={'token': CharField()},
- ),
- },
- )
- def post(self, request):
- serializer = self.serializer_class(data=request.data, request=request)
- serializer.is_valid(raise_exception=True)
-
- # The login form's username field accepts either value: allauth's
- # authentication backend resolves it as a username or an email address.
- 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}'")
- return Response(
- {'detail': 'Username or password unknown'},
- status=status.HTTP_401_UNAUTHORIZED,
- )
-
- form.authenticate(request)
- token = create_token(form.get_user())
- return Response(
- data={'token': token.key},
- status=status.HTTP_200_OK,
- headers={
- 'Deprecation': 'Sat, 01 Oct 2022 23:59:59 GMT',
- },
- )
-
-
class UserAPIRegistrationViewSet(viewsets.ViewSet):
"""
API endpoint
diff --git a/wger/core/forms.py b/wger/core/forms.py
index 090cd5634..5b9a1c85c 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -20,11 +20,7 @@ from datetime import date
# Django
from django import forms
from django.conf import settings
-from django.contrib.auth import authenticate
-from django.contrib.auth.forms import (
- AuthenticationForm,
- PasswordResetForm,
-)
+from django.contrib.auth.forms import PasswordResetForm
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
from django.forms import (
@@ -75,60 +71,6 @@ class PasswordInputWithToggle(PasswordInput):
super().__init__(default_attrs, render_value)
-class UserLoginForm(AuthenticationForm):
- """
- Form for logins
- """
-
- authenticate_on_clean = True
-
- def __init__(self, authenticate_on_clean=True, *args, **kwargs):
- super().__init__(*args, **kwargs)
-
- # Apply custom password widget
- self.fields['password'].widget = PasswordInputWithToggle()
-
- self.authenticate_on_clean = authenticate_on_clean
-
- self.helper = FormHelper()
- self.helper.add_input(Submit('submit', _('Login'), css_class='btn-success btn-block'))
- self.helper.form_class = 'wger-form'
- self.helper.layout = Layout(
- Row(
- Column('username', css_class='col-6'),
- Column('password', css_class='col-6'),
- css_class='form-row',
- )
- )
-
- def clean(self):
- """
- Note: this clean method needs to be able to toggle authenticating directly
- or not. This is needed because django axes expects an explicit request
- parameter and otherwise the login endpoint won't work
-
- See https://github.com/wger-project/wger/issues/1163
- """
- if self.authenticate_on_clean:
- self.authenticate(self.request)
- return self.cleaned_data
-
- def authenticate(self, request):
- username = self.cleaned_data.get('username')
- password = self.cleaned_data.get('password')
-
- if username and password:
- self.user_cache = authenticate(
- request=request,
- username=username,
- password=password,
- )
- if self.user_cache is None:
- raise self.get_invalid_login_error()
- else:
- self.confirm_login_allowed(self.user_cache)
-
-
class WgerLoginForm(AllauthLoginForm):
"""allauth's login form with wger's password-visibility toggle widget."""
diff --git a/wger/core/tests/test_user_login.py b/wger/core/tests/test_user_login.py
index 45eac4d66..c09db35f9 100644
--- a/wger/core/tests/test_user_login.py
+++ b/wger/core/tests/test_user_login.py
@@ -7,7 +7,6 @@ from django.urls import reverse
# Third Party
from rest_framework import status
-from rest_framework.exceptions import ErrorDetail
# wger
from wger.core.tests.api_base_test import ApiBaseTestCase
@@ -85,69 +84,6 @@ class TrainerLoginTestCase(WgerTestCase):
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')],
- )
-
-
class JwtTokenEmailLoginTestCase(BaseTestCase, ApiBaseTestCase):
"""
The SimpleJWT token endpoint forwards its credential as ``username``.
diff --git a/wger/urls.py b/wger/urls.py
index 9c03d560b..a526dbf79 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -290,7 +290,6 @@ urlpatterns = i18n_patterns(
{'sitemaps': sitemaps},
name='django.contrib.sitemaps.views.sitemap',
),
-
path('account/', include('allauth.account.urls')),
path('account/2fa/', include('allauth.mfa.urls')),
)
@@ -311,10 +310,6 @@ urlpatterns += [
),
path('api/v2/check-language/', core_api_views.check_language, name='check-language'),
path('api/v2/', include(router.urls)),
- # The api user login
- path(
- 'api/v2/login/', core_api_views.UserAPILoginView.as_view({'post': 'post'}), name='api_user'
- ),
path(
'api/v2/register/',
core_api_views.UserAPIRegistrationViewSet.as_view({'post': 'post'}),