diff --git a/app/Events/BlockedUserLogin.php b/app/Events/BlockedUserLogin.php deleted file mode 100644 index 5ca2d9430a..0000000000 --- a/app/Events/BlockedUserLogin.php +++ /dev/null @@ -1,43 +0,0 @@ -user = $user; - $this->ipAddress = $ipAddress; - } -} diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 774d23dc29..256224995b 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -17,7 +17,6 @@ use Exception; use FireflyConfig; use FireflyIII\Events\BlockedUseOfDomain; use FireflyIII\Events\BlockedUseOfEmail; -use FireflyIII\Events\BlockedUserLogin; use FireflyIII\Events\ConfirmedUser; use FireflyIII\Events\DeletedUser; use FireflyIII\Events\LockedOutUser; @@ -82,46 +81,6 @@ class UserEventHandler return true; } - /** - * @param BlockedUserLogin $event - * - * @deprecated - * @return bool - */ - public function reportBlockedUser(BlockedUserLogin $event): bool - { - $user = $event->user; - $owner = env('SITE_OWNER'); - $email = $user->email; - $ipAddress = $event->ipAddress; - /** @var Configuration $sendmail */ - $sendmail = FireflyConfig::get('mail_for_blocked_login', config('firefly.configuration.mail_for_blocked_login')); - Log::debug(sprintf('Now in reportBlockedUser for email address %s', $email)); - Log::error(sprintf('User #%d (%s) has their accout blocked (blocked_code is "%s") but tried to login.', $user->id, $email, $user->blocked_code)); - if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) { - return true; - } - - // send email message: - try { - Mail::send( - ['emails.blocked-login-html', 'emails.blocked-login-text'], - [ - 'user_id' => $user->id, - 'user_address' => $email, - 'ip' => $ipAddress, - 'code' => $user->blocked_code, - ], function (Message $message) use ($owner, $user) { - $message->to($owner, $owner)->subject('Blocked login attempt of blocked user'); - } - ); - } catch (Swift_TransportException $e) { - Log::error($e->getMessage()); - } - - return true; - } - /** * @param LockedOutUser $event * diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index a2944b98e4..8b775cc34a 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\BlockedUserLogin; use FireflyIII\Events\LockedOutUser; use FireflyIII\Http\Controllers\Controller; use FireflyIII\User; @@ -83,7 +82,6 @@ class LoginController extends Controller // user exists, but is blocked: $code = strlen(strval($foundUser->blocked_code)) > 0 ? $foundUser->blocked_code : 'general_blocked'; $errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']])); - event(new BlockedUserLogin($foundUser, $request->ip())); } // If the login attempt was unsuccessful we will increment the number of attempts diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index f26e8266ac..1ab4594a68 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -50,10 +50,6 @@ class EventServiceProvider extends ServiceProvider [ 'FireflyIII\Handlers\Events\UserEventHandler@reportLockout', ], - 'FireflyIII\Events\BlockedUserLogin' => // is a User related event. - [ - 'FireflyIII\Handlers\Events\UserEventHandler@reportBlockedUser', - ], 'FireflyIII\Events\BlockedUseOfEmail' => // is a User related event. [ diff --git a/resources/views/emails/blocked-login-html.twig b/resources/views/emails/blocked-login-html.twig deleted file mode 100644 index 187a7cf1f4..0000000000 --- a/resources/views/emails/blocked-login-html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% include 'emails.header-html' %} -

- Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}). -

-

- The blocked code was "{{ code }}". -

-{% include 'emails.footer-html' %} diff --git a/resources/views/emails/blocked-login-text.twig b/resources/views/emails/blocked-login-text.twig deleted file mode 100644 index bad07a0769..0000000000 --- a/resources/views/emails/blocked-login-text.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% include 'emails.header-text' %} -Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}). - -The blocked code was "{{ code }}". -{% include 'emails.footer-text' %}