From 32b639e3eb5eb14655fdf56f8185ed7a88178267 Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 18 Jun 2017 20:27:24 -0500 Subject: [PATCH] Return a 404 if attempting to delete a user that does not exist; closes #503 --- app/Repositories/UserRepository.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index 05a1a53c..1608afe9 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -151,6 +151,8 @@ class UserRepository */ public function delete($id) { + $user = Models\User::findOrFail($id); + if (Models\Server::where('owner_id', $id)->count() > 0) { throw new DisplayException('Cannot delete a user with active servers attached to thier account.'); } @@ -170,7 +172,7 @@ class UserRepository $subuser->delete(); } - Models\User::destroy($id); + $user->delete(); DB::commit(); } catch (\Exception $ex) { DB::rollBack();