From 6992114ce6a37d0d95b9443984b7d9efa926b632 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Wed, 31 May 2017 05:18:14 +0000 Subject: [PATCH] Fix django-rest-auth's bugs so API works (lol...) --- caremyway/api/views.py | 8 +++++++- caremyway/settings.py | 2 ++ caremyway/urls.py | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/caremyway/api/views.py b/caremyway/api/views.py index 5c66a99..d549084 100644 --- a/caremyway/api/views.py +++ b/caremyway/api/views.py @@ -3,7 +3,9 @@ from django.shortcuts import render # Create your views here. from django.contrib.auth.models import User, Group from caremyway.api.models import UserInfo, Client, Provider -from rest_framework import viewsets, permissions +from rest_framework import viewsets, permissions, status +from rest_framework.decorators import api_view +from rest_framework.response import Response from caremyway.api.serializers import UserSerializer, UserInfoSerializer, ClientSerializer, ProviderSerializer class UserViewSet(viewsets.ModelViewSet): @@ -16,3 +18,7 @@ class UserViewSet(viewsets.ModelViewSet): return User.objects.all().order_by('-date_joined') else: return User.objects.filter(username=user) + +@api_view() +def null_view(request): + return Response(status=status.HTTP_400_BAD_REQUEST) diff --git a/caremyway/settings.py b/caremyway/settings.py index 9e41f6d..b117208 100644 --- a/caremyway/settings.py +++ b/caremyway/settings.py @@ -53,8 +53,10 @@ SITE_ID = 1 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' ACCOUNT_AUTHENTICATION_METHOD = 'email' +ACCOUNT_EMAIL_VERIFICATION = 'mandatory' ACCOUNT_EMAIL_REQUIRED = True ACCOUNT_USERNAME_REQUIRED = False +OLD_PASSWORD_FIELD_ENABLED = True #Following is added to enable registration with email instead of username AUTHENTICATION_BACKENDS = ( diff --git a/caremyway/urls.py b/caremyway/urls.py index 5487c88..094851e 100644 --- a/caremyway/urls.py +++ b/caremyway/urls.py @@ -25,6 +25,9 @@ router.register(r'users', views.UserViewSet, 'user') urlpatterns = [ url(r'^', include(router.urls)), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), + url(r'^rest-auth/registration/account-email-verification-sent/', views.null_view, name='account_email_verification_sent'), + url(r'^rest-auth/registration/account-confirm-email/', views.null_view, name='account_confirm_email'), + url(r'^password-reset/confirm/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', views.null_view, name='password_reset_confirm'), url(r'^rest-auth/', include('rest_auth.urls')), url(r'^rest-auth/registration/', include('rest_auth.registration.urls')) ]