From 7d6c91bd2419dcbc0211cf0cdb48ce7663f29c6d Mon Sep 17 00:00:00 2001 From: Mike0001-droid Date: Thu, 20 Jun 2024 11:54:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/proj/account/views.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/server/proj/account/views.py b/server/proj/account/views.py index 47053cf..aca99cb 100644 --- a/server/proj/account/views.py +++ b/server/proj/account/views.py @@ -60,15 +60,6 @@ class MyUserViewSet(ViewSet): def update_user(self, request): password = request.user.password - if request.data['password'] == request.data['email']: - return Response( - {'detail': 'Почта не может являться паролем', 'error': {'email': 'Почта не может являться паролем'}}, - status=status.HTTP_400_BAD_REQUEST) - - if len(request.data['password']) < MIN_LEN_PASSWORD: - return Response( - {'detail': 'Минимальная длина - 8 символов', 'error': {'email': 'Минимальная длина - 8 символов'}}, - status=status.HTTP_400_BAD_REQUEST) if check_password(request.data['password'], password): return Response( @@ -76,6 +67,16 @@ class MyUserViewSet(ViewSet): status=status.HTTP_400_BAD_REQUEST) if check_password(request.data['old_password'], password): + if request.data['password'] == request.data['email']: + return Response( + {'detail': 'Почта не может являться паролем', 'error': {'email': 'Почта не может являться паролем'}}, + status=status.HTTP_400_BAD_REQUEST) + + if len(request.data['password']) < MIN_LEN_PASSWORD: + return Response( + {'detail': 'Минимальная длина - 8 символов', 'error': {'email': 'Минимальная длина - 8 символов'}}, + status=status.HTTP_400_BAD_REQUEST) + if 'email' in request.data: del request.data['email'] if 'password' in request.data: