Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-24 15:29:36 +02:00
Code Issues Releases Activity

Refactor user serializers, update Docker configurations, and remove unused Nginx files

Browse source
This commit is contained in:
Sean Morley 2024-12-01 09:52:04 -05:00
parent 84566b8ec1
commit 50dc0424a9
5 changed files with 21 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backend/server/users/serializers.py
View file

@ -2,23 +2,13 @@ from rest_framework import serializers
from django.contrib.auth import get_user_model
from adventures.models import Collection
from dj_rest_auth.serializers import PasswordResetSerializer
User = get_user_model()
from django.contrib.auth import get_user_model
from django.core.exceptions import ValidationError as DjangoValidationError
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers
try:
from allauth.account import app_settings as allauth_account_settings
from allauth.account.adapter import get_adapter
from allauth.account.utils import setup_user_email
from allauth.socialaccount.models import EmailAddress
from allauth.utils import get_username_max_length
except ImportError:
raise ImportError('allauth needs to be added to INSTALLED_APPS.')
class ChangeEmailSerializer(serializers.Serializer):
new_email = serializers.EmailField(required=True)
@ -37,7 +27,7 @@ from django.contrib.auth import get_user_model
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers
UserModel = get_user_model()
from dj_rest_auth.serializers import UserDetailsSerializer
# from dj_rest_auth.serializers import UserDetailsSerializer
from .models import CustomUser
from rest_framework import serializers
@ -77,9 +67,9 @@ class UserDetailsSerializer(serializers.ModelSerializer):
if hasattr(UserModel, 'public_profile'):
extra_fields.append('public_profile')
class Meta(UserDetailsSerializer.Meta):
class Meta:
model = CustomUser
fields = UserDetailsSerializer.Meta.fields + ('profile_pic', 'uuid', 'public_profile')
fields = ('profile_pic', 'uuid', 'public_profile', 'email', 'date_joined', 'is_staff', 'is_superuser', 'is_active', 'pk')
model = UserModel
fields = ('pk', *extra_fields)