diff --git a/app/Events/BlockedUseOfDomain.php b/app/Events/BlockedUseOfDomain.php deleted file mode 100644 index 2cb252a385..0000000000 --- a/app/Events/BlockedUseOfDomain.php +++ /dev/null @@ -1,44 +0,0 @@ -email = $email; - $this->ipAddress = $ipAddress; - } -} diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index b7e988ff01..818c731188 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -15,7 +15,6 @@ namespace FireflyIII\Handlers\Events; use Exception; use FireflyConfig; -use FireflyIII\Events\BlockedUseOfDomain; use FireflyIII\Events\BlockedUseOfEmail; use FireflyIII\Events\ConfirmedUser; use FireflyIII\Events\DeletedUser; @@ -80,45 +79,6 @@ class UserEventHandler return true; } - /** - * @param BlockedUseOfDomain $event - * - * @deprecated - * @return bool - */ - public function reportUseBlockedDomain(BlockedUseOfDomain $event): bool - { - $email = $event->email; - $owner = env('SITE_OWNER'); - $ipAddress = $event->ipAddress; - $parts = explode('@', $email); - /** @var Configuration $sendmail */ - $sendmail = FireflyConfig::get('mail_for_blocked_domain', config('firefly.configuration.mail_for_blocked_domain')); - Log::debug(sprintf('Now in reportUseBlockedDomain for email address %s', $email)); - Log::error(sprintf('Somebody tried to register using an email address (%s) connected to a banned domain (%s).', $email, $parts[1])); - if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) { - return true; - } - - // send email message: - try { - Mail::send( - ['emails.blocked-registration-html', 'emails.blocked-registration-text'], - [ - 'email_address' => $email, - 'blocked_domain' => $parts[1], - 'ip' => $ipAddress, - ], function (Message $message) use ($owner) { - $message->to($owner, $owner)->subject('Blocked registration attempt with blocked domain'); - } - ); - } catch (Swift_TransportException $e) { - Log::error($e->getMessage()); - } - - return true; - } - /** * @param BlockedUseOfEmail $event * diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 23deaaf46d..0720a98766 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -15,7 +15,6 @@ namespace FireflyIII\Http\Controllers\Auth; use Auth; use Config; use FireflyConfig; -use FireflyIII\Events\BlockedUseOfDomain; use FireflyIII\Events\BlockedUseOfEmail; use FireflyIII\Events\RegisteredUser; use FireflyIII\Http\Controllers\Controller; @@ -81,8 +80,6 @@ class RegisterController extends Controller // is user email domain blocked? if ($this->isBlockedDomain($data['email'])) { $validator->getMessageBag()->add('email', (string)trans('validation.invalid_domain')); - - event(new BlockedUseOfDomain($data['email'], $request->ip())); $this->throwValidationException($request, $validator); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 8d482ea96e..e940e06345 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -51,11 +51,6 @@ class EventServiceProvider extends ServiceProvider [ 'FireflyIII\Handlers\Events\UserEventHandler@reportUseOfBlockedEmail', ], - - 'FireflyIII\Events\BlockedUseOfDomain' => // is a User related event. - [ - 'FireflyIII\Handlers\Events\UserEventHandler@reportUseBlockedDomain', - ], 'FireflyIII\Events\RegisteredUser' => // is a User related event. [ 'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail', diff --git a/resources/views/emails/blocked-registration-html.twig b/resources/views/emails/blocked-registration-html.twig deleted file mode 100644 index 23f39d2ef7..0000000000 --- a/resources/views/emails/blocked-registration-html.twig +++ /dev/null @@ -1,8 +0,0 @@ -{% include 'emails.header-html' %} -

- Firefly III has just blocked a registration for an email addres at domain {{ blocked_domain }}. -

-

- The blocked email address was "{{ email_address }}". -

-{% include 'emails.footer-html' %} diff --git a/resources/views/emails/blocked-registration-text.twig b/resources/views/emails/blocked-registration-text.twig deleted file mode 100644 index c01bcebdee..0000000000 --- a/resources/views/emails/blocked-registration-text.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% include 'emails.header-text' %} -Firefly III has just blocked a registration for an email addres at domain {{ blocked_domain }}. - -The blocked email address was "{{ email_address }}". -{% include 'emails.footer-text' %}