Skip to content

Commit 17061b1

Browse files
committed
Merge branch 'develop' into 'main'
fix: Validate team ID in shared member retrieval, update URL patterns, and ignore .DS_Store See merge request locker/api-core!609
2 parents c740137 + 3e5175b commit 17061b1

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,5 @@ crashlytics-build.properties
6161
fabric.properties
6262
log.txt
6363

64+
#
65+
.DS_Store

locker_server/api/v1_0/sharing/views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,8 @@ def update_role(self, request, *args, **kwargs):
439439
# Retrieve member that accepted
440440
try:
441441
member = self.sharing_service.get_shared_member(sharing_member_id=member_id)
442+
if str(member.team.team_id) != str(kwargs.get("pk")):
443+
raise NotFound
442444
except TeamMemberDoesNotExistException:
443445
raise NotFound
444446

locker_server/api/v1_0/urls.py

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

225225
re_path(r'^payments/invoices$', views.PaymentPwdViewSet.as_view({'get': 'invoices'})),
226226
re_path(r'^payments/invoices/(?P<pk>[A-Z0-9]+)$',
227-
views.PaymentPwdViewSet.as_view({'get': 'retrieve_invoice', 'post': 'retry_invoice'})),
227+
views.PaymentPwdViewSet.as_view({'get': 'retrieve_invoice',})),
228228
]
229229

230230
# -------------------------------- Family Plan members ------------------------------------- #

0 commit comments

Comments
 (0)