security: A01-13 — nest all event routes under organisation prefix
Move all authenticated organiser-facing event sub-resource routes from
/events/{event}/... to /organisations/{organisation}/events/{event}/...
to enforce multi-tenancy at the routing layer.
Changes:
- Routes: restructured api.php to nest all event sub-resources under
the existing organisation prefix group
- Controllers: added Organisation parameter and VerifiesOrganisationEvent
trait to all 12 affected controllers (sections, time-slots, shifts,
persons, crowd-lists, locations, shift-assignments, registration-fields,
availabilities, field-values, section-preferences, stats)
- Tests: updated all 20 feature test files with new route paths
- Frontend: updated 8 API composables and 20 Vue components/pages
- API.md: updated documentation to reflect new route structure
Portal routes, public routes (volunteer-register), and invitation routes
remain unchanged as they operate without organisation context.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -29,6 +29,7 @@ export interface ShiftAssignmentFilters {
|
||||
}
|
||||
|
||||
export function useShiftAssignmentList(
|
||||
orgId: Ref<string>,
|
||||
eventId: Ref<string>,
|
||||
filters?: Ref<ShiftAssignmentFilters>,
|
||||
) {
|
||||
@@ -42,23 +43,23 @@ export function useShiftAssignmentList(
|
||||
if (filters?.value?.status) params.status = filters.value.status
|
||||
|
||||
const { data } = await apiClient.get<PaginatedResponse<ShiftAssignment>>(
|
||||
`/events/${eventId.value}/shift-assignments`,
|
||||
`/organisations/${orgId.value}/events/${eventId.value}/shift-assignments`,
|
||||
{ params },
|
||||
)
|
||||
|
||||
return data
|
||||
},
|
||||
enabled: () => !!eventId.value,
|
||||
enabled: () => !!orgId.value && !!eventId.value,
|
||||
})
|
||||
}
|
||||
|
||||
export function useApproveAssignment(eventId: Ref<string>) {
|
||||
export function useApproveAssignment(orgId: Ref<string>, eventId: Ref<string>) {
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (assignmentId: string) => {
|
||||
const { data } = await apiClient.post<ApiResponse<ShiftAssignment>>(
|
||||
`/events/${eventId.value}/shift-assignments/${assignmentId}/approve`,
|
||||
`/organisations/${orgId.value}/events/${eventId.value}/shift-assignments/${assignmentId}/approve`,
|
||||
)
|
||||
|
||||
return data.data
|
||||
@@ -70,13 +71,13 @@ export function useApproveAssignment(eventId: Ref<string>) {
|
||||
})
|
||||
}
|
||||
|
||||
export function useRejectAssignment(eventId: Ref<string>) {
|
||||
export function useRejectAssignment(orgId: Ref<string>, eventId: Ref<string>) {
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async ({ assignmentId, reason }: { assignmentId: string; reason?: string }) => {
|
||||
const { data } = await apiClient.post<ApiResponse<ShiftAssignment>>(
|
||||
`/events/${eventId.value}/shift-assignments/${assignmentId}/reject`,
|
||||
`/organisations/${orgId.value}/events/${eventId.value}/shift-assignments/${assignmentId}/reject`,
|
||||
{ reason },
|
||||
)
|
||||
|
||||
@@ -89,13 +90,13 @@ export function useRejectAssignment(eventId: Ref<string>) {
|
||||
})
|
||||
}
|
||||
|
||||
export function useCancelAssignment(eventId: Ref<string>) {
|
||||
export function useCancelAssignment(orgId: Ref<string>, eventId: Ref<string>) {
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (assignmentId: string) => {
|
||||
const { data } = await apiClient.post<ApiResponse<ShiftAssignment>>(
|
||||
`/events/${eventId.value}/shift-assignments/${assignmentId}/cancel`,
|
||||
`/organisations/${orgId.value}/events/${eventId.value}/shift-assignments/${assignmentId}/cancel`,
|
||||
)
|
||||
|
||||
return data.data
|
||||
@@ -107,13 +108,13 @@ export function useCancelAssignment(eventId: Ref<string>) {
|
||||
})
|
||||
}
|
||||
|
||||
export function useBulkApproveAssignments(eventId: Ref<string>) {
|
||||
export function useBulkApproveAssignments(orgId: Ref<string>, eventId: Ref<string>) {
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async (assignmentIds: string[]) => {
|
||||
const { data } = await apiClient.post<ApiResponse<unknown>>(
|
||||
`/events/${eventId.value}/shift-assignments/bulk-approve`,
|
||||
`/organisations/${orgId.value}/events/${eventId.value}/shift-assignments/bulk-approve`,
|
||||
{ assignment_ids: assignmentIds },
|
||||
)
|
||||
|
||||
@@ -126,13 +127,13 @@ export function useBulkApproveAssignments(eventId: Ref<string>) {
|
||||
})
|
||||
}
|
||||
|
||||
export function useAssignPersonToShift(eventId: Ref<string>) {
|
||||
export function useAssignPersonToShift(orgId: Ref<string>, eventId: Ref<string>) {
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
return useMutation({
|
||||
mutationFn: async ({ sectionId, shiftId, personId }: { sectionId: string; shiftId: string; personId: string }) => {
|
||||
const { data } = await apiClient.post<ApiResponse<ShiftAssignment>>(
|
||||
`/events/${eventId.value}/sections/${sectionId}/shifts/${shiftId}/assign`,
|
||||
`/organisations/${orgId.value}/events/${eventId.value}/sections/${sectionId}/shifts/${shiftId}/assign`,
|
||||
{ person_id: personId },
|
||||
)
|
||||
|
||||
@@ -147,12 +148,12 @@ export function useAssignPersonToShift(eventId: Ref<string>) {
|
||||
})
|
||||
}
|
||||
|
||||
export function useAssignablePersons(eventId: MaybeRef<string>, shiftId: MaybeRef<string>) {
|
||||
export function useAssignablePersons(orgId: MaybeRef<string>, eventId: MaybeRef<string>, shiftId: MaybeRef<string>) {
|
||||
return useQuery({
|
||||
queryKey: ['assignable-persons', eventId, shiftId],
|
||||
queryFn: async () => {
|
||||
const { data } = await apiClient.get<{ data: AssignablePerson[]; meta: AssignablePersonsMeta }>(
|
||||
`/events/${unref(eventId)}/shifts/${unref(shiftId)}/assignable-persons`,
|
||||
`/organisations/${unref(orgId)}/events/${unref(eventId)}/shifts/${unref(shiftId)}/assignable-persons`,
|
||||
)
|
||||
|
||||
return {
|
||||
@@ -160,6 +161,6 @@ export function useAssignablePersons(eventId: MaybeRef<string>, shiftId: MaybeRe
|
||||
meta: data.meta,
|
||||
}
|
||||
},
|
||||
enabled: () => !!unref(eventId) && !!unref(shiftId),
|
||||
enabled: () => !!unref(orgId) && !!unref(eventId) && !!unref(shiftId),
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user