From 656735649db681f26e7a8e4788ef0931cc61b3e1 Mon Sep 17 00:00:00 2001 From: Timur Date: Sat, 1 Mar 2025 17:40:08 +0300 Subject: [PATCH] add simple user admin and hash password --- services/backend/api/v1/user/views.py | 3 ++- services/backend/apps/user/admin.py | 9 +++++++++ services/backend/apps/user/apps.py | 1 + services/backend/apps/user/models.py | 9 ++++++++- services/backend/config/settings.py | 4 ++++ services/backend/pyproject.toml | 1 + 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 services/backend/apps/user/admin.py diff --git a/services/backend/api/v1/user/views.py b/services/backend/api/v1/user/views.py index ff49988..c4f8c15 100644 --- a/services/backend/api/v1/user/views.py +++ b/services/backend/api/v1/user/views.py @@ -27,6 +27,7 @@ router = Router(tags=["user"]) ) def sign_up(request, data: RegisterSchema): user = User(**data.dict()) + user.password = user.make_password() user.full_clean() user.save() @@ -47,7 +48,7 @@ def sign_in(request, data: LoginSchema): user = User.objects.filter(email=data.email).first() if not user: raise AuthenticationError - if user.password != data.password: + if not user.check_password(data.password): raise AuthenticationError token = BearerAuth.generate_jwt(user) diff --git a/services/backend/apps/user/admin.py b/services/backend/apps/user/admin.py new file mode 100644 index 0000000..89dca07 --- /dev/null +++ b/services/backend/apps/user/admin.py @@ -0,0 +1,9 @@ +from django.contrib import admin + +from apps.user.models import User + + +@admin.register(User) +class UserAdmin(admin.ModelAdmin): + list_display = ("email", "username") + search_fields = ("id", "email", "username") diff --git a/services/backend/apps/user/apps.py b/services/backend/apps/user/apps.py index 2f3daa6..dd71f2d 100644 --- a/services/backend/apps/user/apps.py +++ b/services/backend/apps/user/apps.py @@ -5,3 +5,4 @@ class UsersConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" name = "apps.user" label = "user" + verbose_name = "Пользователи" diff --git a/services/backend/apps/user/models.py b/services/backend/apps/user/models.py index bc7ce07..8fa8b44 100644 --- a/services/backend/apps/user/models.py +++ b/services/backend/apps/user/models.py @@ -1,4 +1,5 @@ from django.db import models +from django.contrib.auth.hashers import check_password, make_password from apps.core.models import BaseModel @@ -11,7 +12,13 @@ class UserRole(models.Choices): class User(BaseModel): email = models.EmailField(unique=True, verbose_name="почта") username = models.SlugField(unique=True, verbose_name="юзернейм") - password = models.TextField(verbose_name="пароль") + password = models.TextField(verbose_name="пароль", editable=False) + + def make_password(self): + return make_password(self.password) + + def check_password(self, password): + return check_password(self.password, password) status = models.CharField( max_length=10, choices=UserRole, default="student" diff --git a/services/backend/config/settings.py b/services/backend/config/settings.py index af06a21..dbb0717 100644 --- a/services/backend/config/settings.py +++ b/services/backend/config/settings.py @@ -483,6 +483,10 @@ DJANGO_GUID = { LANGUAGE_COOKIE_AGE = 31449600 +PASSWORD_HASHERS = [ + "django.contrib.auth.hashers.Argon2PasswordHasher", +] + LANGUAGE_COOKIE_DOMAIN = None LANGUAGE_COOKIE_HTTPONLY = False diff --git a/services/backend/pyproject.toml b/services/backend/pyproject.toml index a3c2a81..200a90d 100644 --- a/services/backend/pyproject.toml +++ b/services/backend/pyproject.toml @@ -4,6 +4,7 @@ version = "0.1.0" readme = "README.md" requires-python = ">=3.10,<3.12" dependencies = [ + "argon2-cffi>=23.1.0", "celery>=5.4.0", "colorlog>=6.9.0", "django-cors-headers>=4.6.0",