Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2024-11-22 17:16:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed confirm email url path + test fixes

Browse Source
This commit is contained in:
mario 2016-07-28 20:14:26 +02:00
parent 0ffc573482
commit 9df528f482
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_auth/registration/urls.py
View File

@ -18,6 +18,6 @@ urlpatterns = [
# If you don't want to use API on that step, then just use ConfirmEmailView # If you don't want to use API on that step, then just use ConfirmEmailView
# view from: # view from:
# django-allauth https://github.com/pennersr/django-allauth/blob/master/allauth/account/views.py#L190 # django-allauth https://github.com/pennersr/django-allauth/blob/master/allauth/account/views.py#L190
url(r'^account-confirm-email/(?P<key>\w+)/$', TemplateView.as_view(), url(r'^account-confirm-email/(?P<key>[-:\w]+)/$', TemplateView.as_view(),
name='account_confirm_email'), name='account_confirm_email'),
] ]

1
rest_auth/registration/views.py
View File

@ -58,6 +58,7 @@ class RegisterView(CreateAPIView):
self.token = jwt_encode(user) self.token = jwt_encode(user)
else: else:
create_token(self.token_model, user, serializer) create_token(self.token_model, user, serializer)
complete_signup(self.request._request, user, complete_signup(self.request._request, user,
allauth_settings.EMAIL_VERIFICATION, allauth_settings.EMAIL_VERIFICATION,
None) None)

3
rest_auth/tests/test_api.py
View File

@ -419,7 +419,8 @@ class APITestCase1(TestCase, BaseAPITestCase):
@override_settings( @override_settings(
ACCOUNT_EMAIL_VERIFICATION='mandatory', ACCOUNT_EMAIL_VERIFICATION='mandatory',
ACCOUNT_EMAIL_REQUIRED=True ACCOUNT_EMAIL_REQUIRED=True,
ACCOUNT_EMAIL_CONFIRMATION_HMAC=False
) )
def test_registration_with_email_verification(self): def test_registration_with_email_verification(self):
user_count = get_user_model().objects.all().count() user_count = get_user_model().objects.all().count()

3
rest_auth/tests/test_social.py
View File

@ -222,7 +222,8 @@ class TestSocialAuth(TestCase, BaseAPITestCase):
@override_settings( @override_settings(
ACCOUNT_EMAIL_VERIFICATION='mandatory', ACCOUNT_EMAIL_VERIFICATION='mandatory',
ACCOUNT_EMAIL_REQUIRED=True, ACCOUNT_EMAIL_REQUIRED=True,
REST_SESSION_LOGIN=False REST_SESSION_LOGIN=False,
ACCOUNT_EMAIL_CONFIRMATION_HMAC=False
) )
def test_edge_case(self): def test_edge_case(self):
resp_body = { resp_body = {

2
rest_auth/tests/urls.py
View File

@ -43,7 +43,7 @@ urlpatterns += [
url(r'^test-admin/', include(django_urls)), url(r'^test-admin/', include(django_urls)),
url(r'^account-email-verification-sent/$', TemplateView.as_view(), url(r'^account-email-verification-sent/$', TemplateView.as_view(),
name='account_email_verification_sent'), name='account_email_verification_sent'),
url(r'^account-confirm-email/(?P<key>\w+)/$', TemplateView.as_view(), url(r'^account-confirm-email/(?P<key>[-:\w]+)/$', TemplateView.as_view(),
name='account_confirm_email'), name='account_confirm_email'),
url(r'^social-login/facebook/$', FacebookLogin.as_view(), name='fb_login'), url(r'^social-login/facebook/$', FacebookLogin.as_view(), name='fb_login'),
url(r'^social-login/twitter/$', TwitterLogin.as_view(), name='tw_login'), url(r'^social-login/twitter/$', TwitterLogin.as_view(), name='tw_login'),