Skip to content

Commit 6f8dc9c

Browse files
committed
refactor(urls): move /token URL under enrollment_littlepay app
it uses a namespace of `littlepay`
1 parent d739cc0 commit 6f8dc9c

File tree

6 files changed

+23
-13
lines changed

6 files changed

+23
-13
lines changed

benefits/enrollment/templates/enrollment/index--littlepay.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
$.ajax({ dataType: "script", attrs: { nonce: "{{ request.csp_nonce }}"}, url: "{{ transit_processor.card_tokenize_url }}" })
1717
.done(function() {
18-
$.get("{% url routes.ENROLLMENT_TOKEN %}", function(data) {
18+
$.get("{% url routes.ENROLLMENT_LITTLEPAY_TOKEN %}", function(data) {
1919
if (data.redirect) {
2020
// https://stackoverflow.com/a/42469170
2121
// use 'assign' because 'replace' was giving strange Back button behavior

benefits/enrollment/urls.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66

77
from benefits.routes import routes
88
from . import views
9-
from benefits.enrollment_littlepay.views import TokenView
109

1110

1211
app_name = "enrollment"
1312
urlpatterns = [
1413
# /enrollment
1514
path("", views.index, name=routes.name(routes.ENROLLMENT_INDEX)),
16-
path("token", TokenView.as_view(), name=routes.name(routes.ENROLLMENT_TOKEN)),
1715
path("error/reenrollment", views.reenrollment_error, name=routes.name(routes.ENROLLMENT_REENROLLMENT_ERROR)),
1816
path("retry", views.retry, name=routes.name(routes.ENROLLMENT_RETRY)),
1917
path("success", views.success, name=routes.name(routes.ENROLLMENT_SUCCESS)),

benefits/enrollment_littlepay/urls.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
from django.urls import path
2+
3+
from benefits.routes import routes
4+
from benefits.enrollment_littlepay.views import TokenView
5+
6+
7+
app_name = "littlepay"
8+
urlpatterns = [
9+
# /littlepay
10+
path("token", TokenView.as_view(), name=routes.name(routes.ENROLLMENT_LITTLEPAY_TOKEN)),
11+
]

benefits/routes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ def ENROLLMENT_INDEX(self):
8585
return "enrollment:index"
8686

8787
@property
88-
def ENROLLMENT_TOKEN(self):
89-
"""Acquire a TransitProcessor API token for enrollment."""
90-
return "enrollment:token"
88+
def ENROLLMENT_LITTLEPAY_TOKEN(self):
89+
"""Acquire a Littlepay card tokenization access token for enrollment."""
90+
return "littlepay:token"
9191

9292
@property
9393
def ENROLLMENT_SUCCESS(self):

benefits/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
path("i18n/", include("django.conf.urls.i18n")),
2929
path("oauth/", include("benefits.oauth.urls")),
3030
path("in_person/", include("benefits.in_person.urls")),
31+
path("littlepay/", include("benefits.enrollment_littlepay.urls")),
3132
]
3233

3334
if settings.RUNTIME_ENVIRONMENT() == settings.RUNTIME_ENVS.LOCAL:

tests/pytest/enrollment_littlepay/test_views.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def mocked_sentry_sdk_module(mocker):
2525

2626
@pytest.mark.django_db
2727
def test_token_ineligible(client):
28-
path = reverse(routes.ENROLLMENT_TOKEN)
28+
path = reverse(routes.ENROLLMENT_LITTLEPAY_TOKEN)
2929

3030
response = client.get(path)
3131

@@ -51,7 +51,7 @@ def test_token_refresh(mocker, client):
5151
),
5252
)
5353

54-
path = reverse(routes.ENROLLMENT_TOKEN)
54+
path = reverse(routes.ENROLLMENT_LITTLEPAY_TOKEN)
5555
response = client.get(path)
5656

5757
assert response.status_code == 200
@@ -66,7 +66,7 @@ def test_token_refresh(mocker, client):
6666
def test_token_valid(mocker, client):
6767
mocker.patch("benefits.enrollment_littlepay.session.Session.access_token_valid", return_value=True)
6868

69-
path = reverse(routes.ENROLLMENT_TOKEN)
69+
path = reverse(routes.ENROLLMENT_LITTLEPAY_TOKEN)
7070
response = client.get(path)
7171

7272
assert response.status_code == 200
@@ -92,7 +92,7 @@ def test_token_system_error(mocker, client, mocked_analytics_module, mocked_sent
9292
),
9393
)
9494

95-
path = reverse(routes.ENROLLMENT_TOKEN)
95+
path = reverse(routes.ENROLLMENT_LITTLEPAY_TOKEN)
9696
response = client.get(path)
9797

9898
assert response.status_code == 200
@@ -122,7 +122,7 @@ def test_token_http_error_400(mocker, client, mocked_analytics_module, mocked_se
122122
),
123123
)
124124

125-
path = reverse(routes.ENROLLMENT_TOKEN)
125+
path = reverse(routes.ENROLLMENT_LITTLEPAY_TOKEN)
126126
response = client.get(path)
127127

128128
assert response.status_code == 200
@@ -149,7 +149,7 @@ def test_token_misconfigured_client_id(mocker, client, mocked_analytics_module,
149149
),
150150
)
151151

152-
path = reverse(routes.ENROLLMENT_TOKEN)
152+
path = reverse(routes.ENROLLMENT_LITTLEPAY_TOKEN)
153153
response = client.get(path)
154154

155155
assert response.status_code == 200
@@ -175,7 +175,7 @@ def test_token_connection_error(mocker, client, mocked_analytics_module, mocked_
175175
),
176176
)
177177

178-
path = reverse(routes.ENROLLMENT_TOKEN)
178+
path = reverse(routes.ENROLLMENT_LITTLEPAY_TOKEN)
179179
response = client.get(path)
180180

181181
assert response.status_code == 200

0 commit comments

Comments
 (0)