Skip to content

Commit bb482b9

Browse files
committed
urls
1 parent 4f0f52e commit bb482b9

File tree

4 files changed

+25
-27
lines changed

4 files changed

+25
-27
lines changed

drfpasswordless/urls.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
app_name = 'drfpasswordless'
1313

1414
urlpatterns = [
15-
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'email/', ObtainEmailCallbackToken.as_view(), name='auth_email', namespace='drfpasswordless'),
16-
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'mobile/', ObtainMobileCallbackToken.as_view(), name='auth_mobile', namespace='drfpasswordless'),
17-
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'token/', ObtainAuthTokenFromCallbackToken.as_view(), name='auth_token', namespace='drfpasswordless'),
18-
path(api_settings.PASSWORDLESS_VERIFY_PREFIX + 'email/', ObtainEmailVerificationCallbackToken.as_view(), name='verify_email', namespace='drfpasswordless'),
19-
path(api_settings.PASSWORDLESS_VERIFY_PREFIX + 'mobile/', ObtainMobileVerificationCallbackToken.as_view(), name='verify_mobile', namespace='drfpasswordless'),
20-
path(api_settings.PASSWORDLESS_VERIFY_PREFIX, VerifyAliasFromCallbackToken.as_view(), name='verify_token', namespace='drfpasswordless'),
15+
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'email/', ObtainEmailCallbackToken.as_view(), name='auth_email'),
16+
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'mobile/', ObtainMobileCallbackToken.as_view(), name='auth_mobile'),
17+
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'token/', ObtainAuthTokenFromCallbackToken.as_view(), name='auth_token'),
18+
path(api_settings.PASSWORDLESS_VERIFY_PREFIX + 'email/', ObtainEmailVerificationCallbackToken.as_view(), name='verify_email'),
19+
path(api_settings.PASSWORDLESS_VERIFY_PREFIX + 'mobile/', ObtainMobileVerificationCallbackToken.as_view(), name='verify_mobile'),
20+
path(api_settings.PASSWORDLESS_VERIFY_PREFIX, VerifyAliasFromCallbackToken.as_view(), name='verify_token'),
2121
]

tests/test_settings.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from rest_framework.test import APITestCase
44

55
from django.contrib.auth import get_user_model
6+
from django.urls import reverse
67
from drfpasswordless.settings import api_settings, DEFAULTS
78
from drfpasswordless.utils import CallbackToken
89

@@ -19,11 +20,11 @@ def setUp(self):
1920
api_settings.PASSWORDLESS_TEST_SUPPRESSION = True
2021

2122
self.email = 'aaron@example.com'
22-
self.email_url = '/auth/email/'
23+
self.email_url = reverse('drfpasswordless:auth_email')
2324
self.email_data = {'email': self.email}
2425

2526
self.mobile = '+15551234567'
26-
self.mobile_url = '/auth/mobile/'
27+
self.mobile_url = reverse('drfpasswordless:auth_mobile')
2728
self.mobile_data = {'mobile': self.mobile}
2829

2930
def test_email_auth_disabled(self):
@@ -89,8 +90,8 @@ def setUp(self):
8990
api_settings.PASSWORDLESS_EMAIL_NOREPLY_ADDRESS = 'noreply@example.com'
9091
api_settings.PASSWORDLESS_USER_MARK_EMAIL_VERIFIED = True
9192

92-
self.url = '/auth/email/'
93-
self.callback_url = '/auth/token/'
93+
self.url = reverse('drfpasswordless:auth_email')
94+
self.callback_url = reverse('drfpasswordless:auth_token')
9495
self.email_field_name = api_settings.PASSWORDLESS_USER_EMAIL_FIELD_NAME
9596
self.email_verified_field_name = api_settings.PASSWORDLESS_USER_EMAIL_VERIFIED_FIELD_NAME
9697

@@ -139,8 +140,8 @@ def setUp(self):
139140
api_settings.PASSWORDLESS_MOBILE_NOREPLY_NUMBER = '+15550000000'
140141
api_settings.PASSWORDLESS_USER_MARK_MOBILE_VERIFIED = True
141142

142-
self.url = '/auth/mobile/'
143-
self.callback_url = '/auth/token/'
143+
self.url = reverse('drfpasswordless:auth_mobile')
144+
self.callback_url = reverse('drfpasswordless:auth_token')
144145
self.mobile_field_name = api_settings.PASSWORDLESS_USER_MOBILE_FIELD_NAME
145146
self.mobile_verified_field_name = api_settings.PASSWORDLESS_USER_MOBILE_VERIFIED_FIELD_NAME
146147

tests/test_verification.py

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from rest_framework.authtoken.models import Token
33
from rest_framework.test import APITestCase
44
from django.contrib.auth import get_user_model
5+
from django.urls import reverse
56
from drfpasswordless.settings import api_settings, DEFAULTS
67
from drfpasswordless.utils import CallbackToken
78

@@ -15,10 +16,10 @@ def setUp(self):
1516
api_settings.PASSWORDLESS_EMAIL_NOREPLY_ADDRESS = 'noreply@example.com'
1617
api_settings.PASSWORDLESS_USER_MARK_EMAIL_VERIFIED = True
1718

18-
self.url = '/auth/email/'
19-
self.callback_url = '/auth/token/'
20-
self.verify_url = '/auth/verify/email/'
21-
self.callback_verify = '/auth/verify/'
19+
self.url = reverse('drfpasswordless:auth_email')
20+
self.callback_url = reverse('drfpasswordless:auth_token')
21+
self.verify_url = reverse('drfpasswordless:verify_email')
22+
self.callback_verify = reverse('drfpasswordless:verify_token')
2223
self.email_field_name = api_settings.PASSWORDLESS_USER_EMAIL_FIELD_NAME
2324
self.email_verified_field_name = api_settings.PASSWORDLESS_USER_EMAIL_VERIFIED_FIELD_NAME
2425

@@ -90,10 +91,10 @@ def setUp(self):
9091
api_settings.PASSWORDLESS_MOBILE_NOREPLY_NUMBER = '+15550000000'
9192
api_settings.PASSWORDLESS_USER_MARK_MOBILE_VERIFIED = True
9293

93-
self.url = '/auth/mobile/'
94-
self.callback_url = '/auth/token/'
95-
self.verify_url = '/auth/verify/mobile/'
96-
self.callback_verify = '/auth/verify/'
94+
self.url = reverse('drfpasswordless:auth_mobile')
95+
self.callback_url = reverse('drfpasswordless:auth_token')
96+
self.verify_url = reverse('drfpasswordless:verify_mobile')
97+
self.callback_verify = reverse('drfpasswordless:verify_token')
9798
self.mobile_field_name = api_settings.PASSWORDLESS_USER_MOBILE_FIELD_NAME
9899
self.mobile_verified_field_name = api_settings.PASSWORDLESS_USER_MOBILE_VERIFIED_FIELD_NAME
99100

tests/urls.py

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from django.urls import path
1+
from django.urls import path, include
22
from rest_framework.urlpatterns import format_suffix_patterns
33
from drfpasswordless.settings import api_settings
44
from drfpasswordless.views import (ObtainEmailCallbackToken,
@@ -9,13 +9,9 @@
99
ObtainMobileVerificationCallbackToken, )
1010

1111
app_name = 'drfpasswordless'
12+
1213
urlpatterns = [
13-
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'email/', ObtainEmailCallbackToken.as_view(), name='auth_email', namespace='drfpasswordless'),
14-
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'mobile/', ObtainMobileCallbackToken.as_view(), name='auth_mobile', namespace='drfpasswordless'),
15-
path(api_settings.PASSWORDLESS_AUTH_PREFIX + 'token/', ObtainAuthTokenFromCallbackToken.as_view(), name='auth_token', namespace='drfpasswordless'),
16-
path(api_settings.PASSWORDLESS_VERIFY_PREFIX + 'email/', ObtainEmailVerificationCallbackToken.as_view(), name='verify_email', namespace='drfpasswordless'),
17-
path(api_settings.PASSWORDLESS_VERIFY_PREFIX + 'mobile/', ObtainMobileVerificationCallbackToken.as_view(), name='verify_mobile', namespace='drfpasswordless'),
18-
path(api_settings.PASSWORDLESS_VERIFY_PREFIX, VerifyAliasFromCallbackToken.as_view(), name='verify_token', namespace='drfpasswordless'),
14+
path('', include('drfpasswordless.urls')),
1915
]
2016

2117
format_suffix_patterns(urlpatterns)

0 commit comments

Comments
 (0)