bert.hausmans
0d24506c89
Frontend: - Consolidate duplicate API layers into single src/lib/axios.ts per app - Remove src/lib/api-client.ts and src/utils/api.ts (admin) - Add src/lib/query-client.ts with TanStack Query config per app - Update all imports and auto-import config Backend: - Fix organisations.billing_status default to 'trial' - Fix user_invitations.invited_by_user_id to nullOnDelete - Add MeResource with separated app_roles and pivot-based org roles - Add cross-org check to EventPolicy view() and update() - Restrict EventPolicy create/update to org_admin/event_manager (not org_member) - Attach creator as org_admin on organisation store - Add query scopes to Event and UserInvitation models - Improve factories with Dutch test data - Expand test suite from 29 to 41 tests (90 assertions) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
41 lines
1.3 KiB
PHP
41 lines
1.3 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Models\Scopes;
|
|
|
|
use Illuminate\Database\Eloquent\Builder;
|
|
use Illuminate\Database\Eloquent\Model;
|
|
use Illuminate\Database\Eloquent\Scope;
|
|
|
|
/**
|
|
* Global scope that filters event-related models by organisation_id.
|
|
*
|
|
* Resolves the organisation from (in order):
|
|
* 1. An explicitly provided organisation ID (constructor)
|
|
* 2. The route parameter 'organisation'
|
|
*
|
|
* IMPORTANT: This scope is route-dependent — it only works when the
|
|
* 'organisation' parameter is present in the URL (e.g. /organisations/{organisation}/events).
|
|
* Routes without an organisation segment (e.g. GET /events/{event}) will NOT be scoped,
|
|
* silently bypassing multi-tenancy. All new routes that touch organisation-owned
|
|
* data MUST be nested under /organisations/{organisation}/... to guarantee scoping.
|
|
*/
|
|
final class OrganisationScope implements Scope
|
|
{
|
|
public function __construct(
|
|
private readonly ?string $organisationId = null,
|
|
) {}
|
|
|
|
public function apply(Builder $builder, Model $model): void
|
|
{
|
|
$id = $this->organisationId
|
|
?? request()->route('organisation')?->id
|
|
?? (is_string(request()->route('organisation')) ? request()->route('organisation') : null);
|
|
|
|
if ($id) {
|
|
$builder->where($model->getTable() . '.organisation_id', $id);
|
|
}
|
|
}
|
|
}
|