rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restcontroller: auth :fix user nullpointer

Browse Source 
add missing parameter to cutler env
This commit is contained in:
Schneider Roland 2023-01-12 10:49:25 +01:00
parent eca459cb65
commit bf5a1f34ab
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
environments/cutlergyor/apache2/config/common/config/params-local.php
View File

@ -1,4 +1,6 @@
<?php <?php
$REST_ALLOW_VERIFY_ONLY=getenv('FITNESS_REST_ALLOW_VERIFY_ONLY');
return [ return [
'user.passwordResetTokenExpire' => 3600, 'user.passwordResetTokenExpire' => 3600,
'company' => 'gyor',//gyor 'company' => 'gyor',//gyor
@ -20,5 +22,6 @@ return [
'reception_transfer_list_only_today' => true, 'reception_transfer_list_only_today' => true,
'reception_show_stock' => false, 'reception_show_stock' => false,
'login_admin_email' => 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'
]; ];

9
rest/controllers/RestController.php
View File

@ -24,12 +24,19 @@ class RestController extends Controller
{ {
try { try {
$user = User::findOne(['username' => $username]); $user = User::findOne(['username' => $username]);
if ( !isset($user ) ){
\Yii::error("User not found: ".$username);
return null;
}
if ($user->validatePassword($password)) { if ($user->validatePassword($password)) {
return $user; return $user;
} }
} catch (\Exception $e) { } 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; return null;
} }