From 1f2152b7fa25044de909cd7eab8d0c7e13499971 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Thu, 14 Sep 2017 20:02:41 -0400 Subject: [PATCH 1/3] Get users by the default key name --- src/SudoSu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SudoSu.php b/src/SudoSu.php index 75070d4..a29562a 100644 --- a/src/SudoSu.php +++ b/src/SudoSu.php @@ -89,7 +89,7 @@ public function getOriginalUser() $userId = $this->session->get($this->sessionKey); - return $this->getUsers()->where('id', $userId)->first(); + return $this->getUsers()->where($this->getUserModel()->getKeyName(), $userId)->first(); } public function hasSudoed() From d4de053edc523d882506a46d8da018e348f968a5 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Thu, 14 Sep 2017 20:05:19 -0400 Subject: [PATCH 2/3] Use the actual key column --- resources/views/user-selector.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/user-selector.blade.php b/resources/views/user-selector.blade.php index ca0e588..7a2f025 100644 --- a/resources/views/user-selector.blade.php +++ b/resources/views/user-selector.blade.php @@ -29,13 +29,13 @@ @foreach ($users as $user) - + @endforeach {!! csrf_field() !!} - + @@ -45,4 +45,4 @@ const element = document.getElementById('sudosu-js-interface'); btn.addEventListener('click', event => element.classList.toggle('hidden')); - \ No newline at end of file + From eca2f5fceee4ba06723a9764932c966a58cb1b41 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Fri, 15 Sep 2017 11:28:09 -0400 Subject: [PATCH 3/3] Semantically the same --- src/SudoSu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SudoSu.php b/src/SudoSu.php index a29562a..de96ffd 100644 --- a/src/SudoSu.php +++ b/src/SudoSu.php @@ -89,7 +89,7 @@ public function getOriginalUser() $userId = $this->session->get($this->sessionKey); - return $this->getUsers()->where($this->getUserModel()->getKeyName(), $userId)->first(); + return $this->getUsers()->find($userId); } public function hasSudoed()