Skip to content

[fix] Use UUID converters for users API detail routes #487 #492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
czarflix wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[fix] Use UUID converters for users API detail routes #487 #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
559e766
[fix] Use UUID converters for users API detail routes #487
czarflix Mar 12, 2026
3bb4ee5
[fix] Compare UUID values in password permission check #487
czarflix Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions openwisp_users/api/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def get_api_urls(api_views=None):
name="organization_list",
),
path(
"users/organization/<str:pk>/",
"users/organization/<uuid:pk>/",
views.organization_detail,
name="organization_detail",
),
Expand All @@ -25,19 +25,19 @@ def get_api_urls(api_views=None):
views.user_list,
name="user_list",
),
path("users/user/<str:pk>/", views.user_detail, name="user_detail"),
path("users/user/<uuid:pk>/", views.user_detail, name="user_detail"),
path(
"users/user/<str:pk>/password/",
"users/user/<uuid:pk>/password/",
views.change_password,
name="change_password",
),
path(
"users/user/<str:pk>/email/",
"users/user/<uuid:pk>/email/",
views.email_list,
name="email_list",
),
path(
"users/user/<str:pk>/email/<int:email_id>/",
"users/user/<uuid:pk>/email/<int:email_id>/",
views.email_update,
name="email_update",
),
Expand Down
2 changes: 1 addition & 1 deletion openwisp_users/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def get_permissions(self):
class if loggedin user wants to change
his own password.
"""
if str(self.request.user.id) == self.kwargs["pk"]:
if self.request.user.id == self.kwargs["pk"]:
self.permission_classes = [IsAuthenticated]
else:
self.permission_classes = [IsAuthenticated, DjangoModelPermissions]
Expand Down
14 changes: 14 additions & 0 deletions openwisp_users/tests/test_api/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,17 @@ def test_protected_api_mixin_view(self):
self.assertEqual(response.headers["WWW-Authenticate"], "Bearer")
self.assertEqual(response.data["detail"], auth_error)
self.assertEqual(response.status_code, 401)

def test_invalid_uuid_routes_return_404(self):
invalid_uuid_paths = (
"/api/v1/users/user/not-a-uuid/",
"/api/v1/users/organization/not-a-uuid/",
"/api/v1/users/user/not-a-uuid/password/",
"/api/v1/users/user/not-a-uuid/email/",
"/api/v1/users/user/not-a-uuid/email/1/",
)

for path in invalid_uuid_paths:
with self.subTest(path=path):
response = self.client.get(path)
self.assertEqual(response.status_code, 404)
Loading