github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-04 08:54:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added testing coverage to API token auth

Browse Source
This commit is contained in:
Dan Brown
2019-12-30 19:42:46 +00:00
parent 6f1b88a6a6
commit 3d11cba223
8 changed files with 126 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Api/ApiTokenGuard.php
View File

@ -150,4 +150,11 @@ class ApiTokenGuard implements Guard
return Hash::check($credentials['secret'], $token->secret);
}
/**
* "Log out" the currently authenticated user.
*/
public function logout()
{
$this->user = null;
}
}

2
app/Auth/Role.php
View File

@ -72,7 +72,7 @@ class Role extends Model
*/
public function detachPermission(RolePermission $permission)
{
$this->permissions()->detach($permission->id);
$this->permissions()->detach([$permission->id]);
}
/**

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

@ -35,7 +35,7 @@ class ApiAuthenticate
}
if ($this->awaitingEmailConfirmation()) {
return $this->emailConfirmationErrorResponse($request);
return $this->emailConfirmationErrorResponse($request, true);
}
return $next($request);

4
app/Http/Middleware/ChecksForEmailConfirmation.php
View File

@ -26,9 +26,9 @@ trait ChecksForEmailConfirmation
* Provide an error response for when the current user's email is not confirmed
* in a system which requires it.
*/
protected function emailConfirmationErrorResponse(Request $request)
protected function emailConfirmationErrorResponse(Request $request, bool $forceJson = false)
{
if ($request->wantsJson()) {
if ($request->wantsJson() || $forceJson) {
return response()->json([
'error' => [
'code' => 401,