Optimierung 3.1: Company::scopeAccessibleBy() zentralisiert Firmenzugriff
Die 4x identische Zugriffs-Closure (owner_user_id == me OR whereHas('users',
me)) in CompanyController (index/show), PressReleaseController::
findOwnedCompany und CustomerCompanyContext::accessibleCompanyQuery durch
einen Company::scopeAccessibleBy() ersetzt; das Scope-Verhalten
(withoutGlobalScopes) bleibt beim Aufrufer.
Bewusst unangetastet: User::accessibleCompanyIds() (relationenbasiert MIT
globalen Scopes - anderes Scope-Verhalten) und PressReleaseImageController
(prueft PR-Autorschaft user_id, nicht Firmenzugriff).
Tests: neuer Scope-Test; volle Suite gruen (801 passed, 1 skipped).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
6a1240bdfb
commit
dba76910ca
5 changed files with 34 additions and 16 deletions
|
|
@ -15,10 +15,7 @@ class CompanyController extends Controller
|
|||
abort_unless($request->user()->tokenCan('companies:read'), 403);
|
||||
|
||||
$companies = Company::withoutGlobalScopes()
|
||||
->where(function ($query) use ($request): void {
|
||||
$query->where('owner_user_id', $request->user()->id)
|
||||
->orWhereHas('users', fn ($users) => $users->whereKey($request->user()->id));
|
||||
})
|
||||
->accessibleBy($request->user())
|
||||
->orderBy('name')
|
||||
->paginate(min((int) $request->query('per_page', 25), 100));
|
||||
|
||||
|
|
@ -36,10 +33,7 @@ class CompanyController extends Controller
|
|||
|
||||
$company = Company::withoutGlobalScopes()
|
||||
->whereKey($company)
|
||||
->where(function ($query) use ($request): void {
|
||||
$query->where('owner_user_id', $request->user()->id)
|
||||
->orWhereHas('users', fn ($users) => $users->whereKey($request->user()->id));
|
||||
})
|
||||
->accessibleBy($request->user())
|
||||
->first();
|
||||
|
||||
abort_unless($company !== null, 403);
|
||||
|
|
|
|||
|
|
@ -183,10 +183,7 @@ class PressReleaseController extends Controller
|
|||
{
|
||||
return Company::withoutGlobalScopes()
|
||||
->whereKey($companyId)
|
||||
->where(function ($query) use ($request): void {
|
||||
$query->where('owner_user_id', $request->user()->id)
|
||||
->orWhereHas('users', fn ($users) => $users->whereKey($request->user()->id));
|
||||
})
|
||||
->accessibleBy($request->user())
|
||||
->first();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue