diff --git a/app/Events/LockedOutUser.php b/app/Events/LockedOutUser.php deleted file mode 100644 index 07586faefb..0000000000 --- a/app/Events/LockedOutUser.php +++ /dev/null @@ -1,42 +0,0 @@ -email = $email; - $this->ipAddress = $ipAddress; - } -} diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 256224995b..b7e988ff01 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -19,7 +19,6 @@ use FireflyIII\Events\BlockedUseOfDomain; use FireflyIII\Events\BlockedUseOfEmail; use FireflyIII\Events\ConfirmedUser; use FireflyIII\Events\DeletedUser; -use FireflyIII\Events\LockedOutUser; use FireflyIII\Events\RegisteredUser; use FireflyIII\Events\RequestedNewPassword; use FireflyIII\Events\ResentConfirmation; @@ -81,39 +80,6 @@ class UserEventHandler return true; } - /** - * @param LockedOutUser $event - * - * @deprecated - * @return bool - */ - public function reportLockout(LockedOutUser $event): bool - { - $email = $event->email; - $owner = env('SITE_OWNER'); - $ipAddress = $event->ipAddress; - /** @var Configuration $sendmail */ - $sendmail = FireflyConfig::get('mail_for_lockout', config('firefly.configuration.mail_for_lockout')); - Log::debug(sprintf('Now in respondToLockout for email address %s', $email)); - Log::error(sprintf('User %s was locked out after too many invalid login attempts.', $email)); - if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) { - return true; - } - - // send email message: - try { - Mail::send( - ['emails.locked-out-html', 'emails.locked-out-text'], ['email' => $email, 'ip' => $ipAddress], function (Message $message) use ($owner) { - $message->to($owner, $owner)->subject('User was locked out'); - } - ); - } catch (Swift_TransportException $e) { - Log::error($e->getMessage()); - } - - return true; - } - /** * @param BlockedUseOfDomain $event * diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 8b775cc34a..79740cc936 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -14,7 +14,6 @@ namespace FireflyIII\Http\Controllers\Auth; use Config; use FireflyConfig; -use FireflyIII\Events\LockedOutUser; use FireflyIII\Http\Controllers\Controller; use FireflyIII\User; use Illuminate\Foundation\Auth\AuthenticatesUsers; @@ -62,8 +61,6 @@ class LoginController extends Controller if ($lockedOut) { $this->fireLockoutEvent($request); - event(new LockedOutUser($request->get('email'), $request->ip())); - return $this->sendLockoutResponse($request); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 1ab4594a68..8d482ea96e 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -46,10 +46,6 @@ class EventServiceProvider extends ServiceProvider [ 'FireflyIII\Handlers\Events\UserEventHandler@saveEmailAddress', ], - 'FireflyIII\Events\LockedOutUser' => // is a User related event. - [ - 'FireflyIII\Handlers\Events\UserEventHandler@reportLockout', - ], 'FireflyIII\Events\BlockedUseOfEmail' => // is a User related event. [ diff --git a/resources/views/emails/locked-out-html.twig b/resources/views/emails/locked-out-html.twig deleted file mode 100644 index 8f4386dacc..0000000000 --- a/resources/views/emails/locked-out-html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% include 'emails.header-html' %} -

- Firefly III has just locked out somebody trying to login with email address {{ email }}. -

-{% include 'emails.footer-html' %} diff --git a/resources/views/emails/locked-out-text.twig b/resources/views/emails/locked-out-text.twig deleted file mode 100644 index 81b3e54796..0000000000 --- a/resources/views/emails/locked-out-text.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% include 'emails.header-text' %} -Firefly III has just locked out somebody trying to login with email address {{ email }}. -{% include 'emails.footer-text' %}