From 03d5e99f72a8edf0cf172a57aee9d6f976c87603 Mon Sep 17 00:00:00 2001 From: Thomas Fink <53316058+ThomasAFink@users.noreply.github.com> Date: Fri, 24 Jan 2025 13:51:54 +0100 Subject: [PATCH] clean(ZMS): use logger in Oidc.php --- zmsstatistic/src/Zmsstatistic/Oidc.php | 29 +++++++++++--------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/zmsstatistic/src/Zmsstatistic/Oidc.php b/zmsstatistic/src/Zmsstatistic/Oidc.php index a62148946..c8e1e1b18 100644 --- a/zmsstatistic/src/Zmsstatistic/Oidc.php +++ b/zmsstatistic/src/Zmsstatistic/Oidc.php @@ -23,34 +23,32 @@ public function readResponse( $state = $request->getParam("state"); $authKey = \BO\Zmsclient\Auth::getKey(); - // Log state validation attempt - error_log(json_encode([ + \App::$log->info('OIDC state validation', [ 'event' => 'oauth_state_validation', 'timestamp' => date('c'), 'provider' => \BO\Zmsclient\Auth::getOidcProvider(), 'application' => 'zmsstatistic', 'state_match' => ($state == $authKey) - ])); + ]); if ($state == $authKey) { try { $workstation = \App::$http->readGetResult('/workstation/', ['resolveReferences' => 2])->getEntity(); $username = $workstation->getUseraccount()->id . '@' . \BO\Zmsclient\Auth::getOidcProvider(); - // Log workstation access with username - error_log(json_encode([ + \App::$log->info('OIDC workstation access', [ 'event' => 'oauth_workstation_access', 'timestamp' => date('c'), 'provider' => \BO\Zmsclient\Auth::getOidcProvider(), 'application' => 'zmsstatistic', 'username' => $username, 'workstation_id' => $workstation->id ?? 'unknown' - ])); + ]); $departmentCount = $workstation->getUseraccount()->getDepartmentList()->count(); // Log department check with username - error_log(json_encode([ + \App::$log->info('OIDC department check', [ 'event' => 'oauth_department_check', 'timestamp' => date('c'), 'provider' => \BO\Zmsclient\Auth::getOidcProvider(), @@ -58,7 +56,7 @@ public function readResponse( 'username' => $username, 'department_count' => $departmentCount, 'has_departments' => ($departmentCount > 0) - ])); + ]); if (0 == $departmentCount) { return \BO\Slim\Render::redirect( @@ -75,39 +73,36 @@ public function readResponse( [] ); } catch (\Exception $e) { - // Log workstation access error - error_log(json_encode([ + \App::$log->error('OIDC workstation error', [ 'event' => 'oauth_workstation_error', 'timestamp' => date('c'), 'provider' => \BO\Zmsclient\Auth::getOidcProvider(), 'application' => 'zmsstatistic', 'error' => $e->getMessage(), 'code' => $e->getCode() - ])); + ]); throw $e; } } - // Log invalid state - error_log(json_encode([ + \App::$log->error('OIDC invalid state', [ 'event' => 'oauth_invalid_state', 'timestamp' => date('c'), 'provider' => \BO\Zmsclient\Auth::getOidcProvider(), 'application' => 'zmsstatistic' - ])); + ]); throw new \BO\Slim\Exception\OAuthInvalid(); } catch (\Exception $e) { - // Log any uncaught exceptions - error_log(json_encode([ + \App::$log->error('OIDC error', [ 'event' => 'oauth_error', 'timestamp' => date('c'), 'provider' => \BO\Zmsclient\Auth::getOidcProvider(), 'application' => 'zmsstatistic', 'error' => $e->getMessage(), 'code' => $e->getCode() - ])); + ]); throw $e; } }