diff --git a/app/Events/EventType.php b/app/Events/EventType.php new file mode 100644 index 0000000..dd268db --- /dev/null +++ b/app/Events/EventType.php @@ -0,0 +1,26 @@ +sendAsync($request)->wait(); return $res->getBody(); - } catch (\Exception $e) { + } catch (Exception $e) { Log::error($e); } } @@ -58,3 +60,23 @@ function sendSMSVerification(string|int $phone_number): ?Verification return $verification; } + +/** + * Store auth events + */ +function storeAuthEvent(string $name, Request $request): void +{ + Log::channel('auth_activity') + ->info(sprintf( + '%s, APP_NAME: %s, REQUEST_TYPE: %s, SOURCE_IP: %s, SOURCE_PORT: %s, SOURCE_URL: %s, DESTINATION_IP: %s, DESTINATION_PORT: %s, DESTINATION_COUNTRY: %s', + $name, + config('app.name'), + $request->method(), + $request->ip(), + $_SERVER['REMOTE_PORT'], + $request->url(), + $request->host(), + $request->getPort(), + 'tk', + )); +} diff --git a/app/Listeners/LoginListener.php b/app/Listeners/LoginListener.php index 70a92f8..d573897 100644 --- a/app/Listeners/LoginListener.php +++ b/app/Listeners/LoginListener.php @@ -2,7 +2,7 @@ namespace App\Listeners; -use Illuminate\Support\Facades\Log; +use App\Events\EventType; class LoginListener { @@ -23,24 +23,6 @@ class LoginListener */ public function handle($event): void { - $user = $event->user; - - if (! $user) { - return; - } - - Log::channel('auth_activity') - ->info(sprintf( - '%s, APP_NAME: %s, REQUEST_TYPE: %s, SOURCE_IP: %s, SOURCE_PORT: %s, SOURCE_URL: %s, DESTINATION_IP: %s, DESTINATION_PORT: %s, DESTINATION_COUNTRY: %s', - 'LOGIN', - config('app.name'), - request()->method(), - request()->ip(), - $_SERVER['REMOTE_PORT'], - request()->url(), - request()->host(), - request()->getPort(), - 'tk', - )); + $event->user ? storeAuthEvent(EventType::LOGIN, request()) : ''; } } diff --git a/app/Listeners/LogoutListener.php b/app/Listeners/LogoutListener.php index e03ea62..360efde 100644 --- a/app/Listeners/LogoutListener.php +++ b/app/Listeners/LogoutListener.php @@ -2,7 +2,7 @@ namespace App\Listeners; -use Illuminate\Support\Facades\Log; +use App\Events\EventType; class LogoutListener { @@ -20,28 +20,9 @@ class LogoutListener * Handle the event. * * @param object $event - * @return void */ - public function handle($event) + public function handle($event): void { - $user = $event->user; - - if (! $user) { - return; - } - - Log::channel('auth_activity') - ->info(sprintf( - '%s, APP_NAME: %s, REQUEST_TYPE: %s, SOURCE_IP: %s, SOURCE_PORT: %s, SOURCE_URL: %s, DESTINATION_IP: %s, DESTINATION_PORT: %s, DESTINATION_COUNTRY: %s', - 'LOGOUT', - config('app.name'), - request()->method(), - request()->ip(), - $_SERVER['REMOTE_PORT'], - request()->url(), - request()->host(), - request()->getPort(), - 'tk', - )); + $event->user ? storeAuthEvent(EventType::LOGOUT, request()) : ''; } } diff --git a/resources/views/vendor/nova/pages/reset-password.blade.php b/resources/views/vendor/nova/pages/reset-password.blade.php index 3c5f261..90b5990 100644 --- a/resources/views/vendor/nova/pages/reset-password.blade.php +++ b/resources/views/vendor/nova/pages/reset-password.blade.php @@ -1,4 +1,3 @@ -