archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-16 13:31:25 +00:00
Code Issues Projects Releases Wiki Activity

Applied StyleCI changes

Browse source
This commit is contained in:
Dan Brown 2021-11-30 14:25:09 +00:00
parent 3b3eb0f44f
commit 9490457d04
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
2 changed files with 6 additions and 5 deletions
app
Auth/Permissions
PermissionService.php
Http/Middleware
ApiAuthenticate.php

2
app/Auth/Permissions/PermissionService.php
View file

@ -645,7 +645,7 @@ class PermissionService
public function filterRelatedEntity(string $entityClass, Builder $query, string $tableName, string $entityIdColumn): Builder public function filterRelatedEntity(string $entityClass, Builder $query, string $tableName, string $entityIdColumn): Builder
{ {
$fullEntityIdColumn = $tableName . '.' . $entityIdColumn; $fullEntityIdColumn = $tableName . '.' . $entityIdColumn;
$instance = new $entityClass; $instance = new $entityClass();
$morphClass = $instance->getMorphClass(); $morphClass = $instance->getMorphClass();
$existsQuery = function ($permissionQuery) use ($fullEntityIdColumn, $morphClass) { $existsQuery = function ($permissionQuery) use ($fullEntityIdColumn, $morphClass) {

3
app/Http/Middleware/ApiAuthenticate.php
View file

@ -50,11 +50,12 @@ class ApiAuthenticate
} }
/** /**
* Check if the active session user has API access * Check if the active session user has API access.
*/ */
protected function sessionUserHasApiAccess(): bool protected function sessionUserHasApiAccess(): bool
{ {
$hasApiPermission = user()->can('access-api'); $hasApiPermission = user()->can('access-api');
return $hasApiPermission && hasAppAccess(); return $hasApiPermission && hasAppAccess();
} }