From bf5a1f34abc5c268409a2a2c76996aca553b6283 Mon Sep 17 00:00:00 2001 From: Schneider Roland Date: Thu, 12 Jan 2023 10:49:25 +0100 Subject: [PATCH] restcontroller: auth :fix user nullpointer add missing parameter to cutler env --- .../apache2/config/common/config/params-local.php | 5 ++++- rest/controllers/RestController.php | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/environments/cutlergyor/apache2/config/common/config/params-local.php b/environments/cutlergyor/apache2/config/common/config/params-local.php index 290f23b..20c48c3 100644 --- a/environments/cutlergyor/apache2/config/common/config/params-local.php +++ b/environments/cutlergyor/apache2/config/common/config/params-local.php @@ -1,4 +1,6 @@ 3600, 'company' => 'gyor',//gyor @@ -20,5 +22,6 @@ return [ 'reception_transfer_list_only_today' => true, 'reception_show_stock' => false, 'login_admin_email' => false, - 'warn_ticket_expire_in_usage_count' => 10 + 'warn_ticket_expire_in_usage_count' => 10, + 'rest_allow_verify_only' => $REST_ALLOW_VERIFY_ONLY === 'true' ]; diff --git a/rest/controllers/RestController.php b/rest/controllers/RestController.php index a3e38f7..3e88fed 100644 --- a/rest/controllers/RestController.php +++ b/rest/controllers/RestController.php @@ -24,12 +24,19 @@ class RestController extends Controller { try { $user = User::findOne(['username' => $username]); + + if ( !isset($user ) ){ + \Yii::error("User not found: ".$username); + return null; + } + if ($user->validatePassword($password)) { return $user; } } catch (\Exception $e) { - \Yii::error("Failed to load user: " . $e->getMessage()); + \Yii::error("Failed to load user $username: " . $e->getMessage()); } + \Yii::error("User not found: ".$username); return null; }