refactor: Remove djoser dependency

This commit is contained in:
aldrin 2021-05-18 12:07:03 +02:00
parent a8464d7536
commit 048c8927b8
7 changed files with 62 additions and 54 deletions

View file

@ -1,26 +1,13 @@
from djoser.serializers import UserSerializer as BaseUserSerializer
from rest_framework import serializers
from userausfall.models import AccountRequest
from userausfall.models import AccountRequest, User
class AccountRequestSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = AccountRequest
fields = (
"url",
"email",
"confidant_email",
"username",
"is_verified",
"is_trustable",
)
class UserSerializer(BaseUserSerializer):
class UserSerializer(serializers.ModelSerializer):
confidant_email = serializers.EmailField(source="get_confidant_email")
class Meta(BaseUserSerializer.Meta):
class Meta:
model = User
fields = ("email", "username", "confidant_email")
def get_confidant_email(self):

View file

@ -1,6 +1,6 @@
from rest_framework import routers
from userausfall.rest_api.views import AccountRequestViewSet
from userausfall.rest_api.views import UserViewSet
router = routers.DefaultRouter(trailing_slash=True)
router.register(r'account_requests', AccountRequestViewSet)
router.register(r'users', UserViewSet, basename="user")

View file

@ -1,9 +1,19 @@
from rest_framework import viewsets
from rest_framework.decorators import action
from rest_framework.response import Response
from userausfall.models import AccountRequest
from userausfall.rest_api.serializers import AccountRequestSerializer
from userausfall.models import User
from userausfall.rest_api.serializers import UserSerializer
class AccountRequestViewSet(viewsets.ModelViewSet):
serializer_class = AccountRequestSerializer
queryset = AccountRequest.objects.all()
class UserViewSet(viewsets.ModelViewSet):
class Meta:
queryset = User.objects.all()
@action(detail=False, methods=["PATCH"])
def me(self, request):
return Response(
UserSerializer(
instance=request.user, context={"request": request}
).data
)

View file

@ -38,8 +38,6 @@ INSTALLED_APPS = [
'django.contrib.staticfiles',
'userausfall',
'rest_framework',
'rest_framework.authtoken',
'djoser',
]
MIDDLEWARE = [
@ -137,18 +135,6 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
MEDIA_URL = '/media/'
# Djoser settings
# https://djoser.readthedocs.io/en/2.1.0/settings.html
DJOSER = {
"ACTIVATION_URL": "confirm/{uid}/{token}",
"SEND_ACTIVATION_EMAIL": True,
"SERIALIZERS": {
"current_user": "userausfall.rest_api.serializers.UserSerializer",
}
}
# Sending email
# https://docs.djangoproject.com/en/3.2/topics/email/
@ -160,6 +146,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.TokenAuthentication',
'rest_framework.authentication.SessionAuthentication',
),
}

View file

@ -6,6 +6,5 @@ from userausfall.rest_api import urls as rest_api_urls
urlpatterns = [
path('admin/', admin.site.urls),
path('api/', include(rest_api_urls.router.urls)),
path('api/', include('djoser.urls')),
path('api/', include('djoser.urls.authtoken')),
path("api-auth/", include("rest_framework.urls")),
]