webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-28 17:02:04 +03:00
Code Activity

Added API listing filtering & cleaned ApiAuthenticate returns

Browse Source 
API listing endpoint filter can be found via &filter[name]=my+book query
parameters. There are a range of operators that can be used such as
&filter[id:gte]=4
This commit is contained in:
Dan Brown
2020-01-01 16:33:47 +00:00
parent 55abf7be24
commit a7a97a53f1
9 changed files with 186 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/Http/Middleware/ApiAuthenticate.php
View File

@ -2,7 +2,7 @@
namespace BookStack\Http\Middleware;
use BookStack\Exceptions\ApiAuthException;
use BookStack\Exceptions\UnauthorizedException;
use Closure;
use Illuminate\Http\Request;
@ -14,31 +14,37 @@ class ApiAuthenticate
* Handle an incoming request.
*/
public function handle(Request $request, Closure $next)
{
// Validate the token and it's users API access
try {
$this->ensureAuthorizedBySessionOrToken();
} catch (UnauthorizedException $exception) {
return $this->unauthorisedResponse($exception->getMessage(), $exception->getCode());
}
return $next($request);
}
/**
* Ensure the current user can access authenticated API routes, either via existing session
* authentication or via API Token authentication.
* @throws UnauthorizedException
*/
protected function ensureAuthorizedBySessionOrToken(): void
{
// Return if the user is already found to be signed in via session-based auth.
// This is to make it easy to browser the API via browser after just logging into the system.
if (signedInUser()) {
if ($this->awaitingEmailConfirmation()) {
return $this->emailConfirmationErrorResponse($request);
}
return $next($request);
$this->ensureEmailConfirmedIfRequested();
return;
}
// Set our api guard to be the default for this request lifecycle.
auth()->shouldUse('api');
// Validate the token and it's users API access
try {
auth()->authenticate();
} catch (ApiAuthException $exception) {
return $this->unauthorisedResponse($exception->getMessage(), $exception->getCode());
}
if ($this->awaitingEmailConfirmation()) {
return $this->emailConfirmationErrorResponse($request, true);
}
return $next($request);
auth()->authenticate();
$this->ensureEmailConfirmedIfRequested();
}
/**
@ -51,6 +57,6 @@ class ApiAuthenticate
'code' => $code,
'message' => $message,
]
], 401);
], $code);
}
}