github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-18 10:22:28 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Addressed test failures from users API changes

Browse Source
This commit is contained in:
Dan Brown
2022-02-04 01:02:13 +00:00
parent 46e6e239dc
commit c8be6ee8a6
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Auth/UserRepo.php
View File

@ -192,7 +192,7 @@ class UserRepo
*/
public function create(array $data, bool $sendInvite = false): User
{
$user = $this->createWithoutActivity($data, false);
$user = $this->createWithoutActivity($data, true);
if ($sendInvite) {
$this->inviteService->sendInvitation($user);

5
app/Exceptions/NotifyException.php
View File

@ -39,6 +39,11 @@ class NotifyException extends Exception implements Responsable
{
$message = $this->getMessage();
// Front-end JSON handling. API-side handling managed via handler.
if ($request->wantsJson()) {
return response()->json(['error' => $message], 403);
}
if (!empty($message)) {
session()->flash('error', $message);
}

1
app/Http/Controllers/UserController.php
View File

@ -140,6 +140,7 @@ class UserController extends Controller
'language' => ['string'],
'roles' => ['array'],
'roles.*' => ['integer'],
'external_auth_id' => ['string'],
'profile_image' => array_merge(['nullable'], $this->getImageValidationRules()),
]);