From 94d0401f4ed9ac90ec98ff2c07cd1a236367d837 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 28 Dec 2016 10:07:36 +0100 Subject: [PATCH] Removed deprecated event and handlers. (block use of email and deleted user) --- app/Events/BlockedUseOfEmail.php | 43 ------------ app/Events/DeletedUser.php | 39 ----------- app/Handlers/Events/UserEventHandler.php | 66 ------------------- .../Controllers/Auth/RegisterController.php | 2 - app/Providers/EventServiceProvider.php | 10 --- app/Repositories/User/UserRepository.php | 6 -- .../views/emails/blocked-email-html.twig | 5 -- .../views/emails/blocked-email-text.twig | 3 - 8 files changed, 174 deletions(-) delete mode 100644 app/Events/BlockedUseOfEmail.php delete mode 100644 app/Events/DeletedUser.php delete mode 100644 resources/views/emails/blocked-email-html.twig delete mode 100644 resources/views/emails/blocked-email-text.twig diff --git a/app/Events/BlockedUseOfEmail.php b/app/Events/BlockedUseOfEmail.php deleted file mode 100644 index 8676a4648d..0000000000 --- a/app/Events/BlockedUseOfEmail.php +++ /dev/null @@ -1,43 +0,0 @@ -email = $email; - $this->ipAddress = $ipAddress; - } -} diff --git a/app/Events/DeletedUser.php b/app/Events/DeletedUser.php deleted file mode 100644 index 5137cf2862..0000000000 --- a/app/Events/DeletedUser.php +++ /dev/null @@ -1,39 +0,0 @@ -email = $email; - } -} diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 818c731188..916748ea94 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -15,9 +15,7 @@ namespace FireflyIII\Handlers\Events; use Exception; use FireflyConfig; -use FireflyIII\Events\BlockedUseOfEmail; use FireflyIII\Events\ConfirmedUser; -use FireflyIII\Events\DeletedUser; use FireflyIII\Events\RegisteredUser; use FireflyIII\Events\RequestedNewPassword; use FireflyIII\Events\ResentConfirmation; @@ -79,70 +77,6 @@ class UserEventHandler return true; } - /** - * @param BlockedUseOfEmail $event - * - * @deprecated - * @return bool - */ - public function reportUseOfBlockedEmail(BlockedUseOfEmail $event): bool - { - $email = $event->email; - $owner = env('SITE_OWNER'); - $ipAddress = $event->ipAddress; - /** @var Configuration $sendmail */ - $sendmail = FireflyConfig::get('mail_for_blocked_email', config('firefly.configuration.mail_for_blocked_email')); - Log::debug(sprintf('Now in reportUseOfBlockedEmail for email address %s', $email)); - Log::error(sprintf('Somebody tried to register using email address %s which is blocked (SHA2 hash).', $email)); - if (is_null($sendmail) || (!is_null($sendmail) && $sendmail->data === false)) { - return true; - } - - // send email message: - try { - Mail::send( - ['emails.blocked-email-html', 'emails.blocked-email-text'], - [ - 'user_address' => $email, - 'ip' => $ipAddress, - ], function (Message $message) use ($owner) { - $message->to($owner, $owner)->subject('Blocked registration attempt with blocked email address'); - } - ); - } catch (Swift_TransportException $e) { - Log::error($e->getMessage()); - } - - return true; - } - - /** - * @param DeletedUser $event - * - * @deprecated - * @return bool - */ - public function saveEmailAddress(DeletedUser $event): bool - { - Preferences::mark(); - $email = hash('sha256', $event->email); - Log::debug(sprintf('Hash of email is %s', $email)); - /** @var Configuration $configuration */ - $configuration = FireflyConfig::get('deleted_users', []); - $content = $configuration->data; - if (!is_array($content)) { - $content = []; - } - $content[] = $email; - $configuration->data = $content; - Log::debug('New content of deleted_users is ', $content); - FireflyConfig::set('deleted_users', $content); - - Preferences::mark(); - - return true; - } - /** * This method will send a newly registered user a confirmation message, urging him or her to activate their account. * diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 0720a98766..07ad2253b4 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\BlockedUseOfEmail; use FireflyIII\Events\RegisteredUser; use FireflyIII\Http\Controllers\Controller; use FireflyIII\User; @@ -91,7 +90,6 @@ class RegisterController extends Controller Log::debug('Hashes of deleted users: ', $set); if (in_array($hash, $set)) { $validator->getMessageBag()->add('email', (string)trans('validation.deleted_user')); - event(new BlockedUseOfEmail($data['email'], $request->ip())); $this->throwValidationException($request, $validator); } diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index e940e06345..6755c90101 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -41,16 +41,6 @@ class EventServiceProvider extends ServiceProvider [ 'FireflyIII\Handlers\Events\UserEventHandler@storeConfirmationIpAddress', ], - - 'FireflyIII\Events\DeletedUser' => // is a User related event. - [ - 'FireflyIII\Handlers\Events\UserEventHandler@saveEmailAddress', - ], - - 'FireflyIII\Events\BlockedUseOfEmail' => // is a User related event. - [ - 'FireflyIII\Handlers\Events\UserEventHandler@reportUseOfBlockedEmail', - ], 'FireflyIII\Events\RegisteredUser' => // is a User related event. [ 'FireflyIII\Handlers\Events\UserEventHandler@sendRegistrationMail', diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 6e38137f9c..5c2c567357 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -15,7 +15,6 @@ namespace FireflyIII\Repositories\User; use FireflyConfig; -use FireflyIII\Events\DeletedUser; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\Role; use FireflyIII\User; @@ -69,14 +68,9 @@ class UserRepository implements UserRepositoryInterface */ public function destroy(User $user): bool { - $email = $user->email; Log::debug(sprintf('Calling delete() on user %d', $user->id)); $user->delete(); - - // trigger event: - event(new DeletedUser($email)); - return true; } diff --git a/resources/views/emails/blocked-email-html.twig b/resources/views/emails/blocked-email-html.twig deleted file mode 100644 index a7f67fdd0a..0000000000 --- a/resources/views/emails/blocked-email-html.twig +++ /dev/null @@ -1,5 +0,0 @@ -{% include 'emails.header-html' %} -

- Firefly III has just blocked a registration for email addres "{{ email_address }}". It was used before. -

-{% include 'emails.footer-html' %} diff --git a/resources/views/emails/blocked-email-text.twig b/resources/views/emails/blocked-email-text.twig deleted file mode 100644 index 7bfdf9c032..0000000000 --- a/resources/views/emails/blocked-email-text.twig +++ /dev/null @@ -1,3 +0,0 @@ -{% include 'emails.header-text' %} -Firefly III has just blocked a registration for email addres "{{ user_address }}". It was used before. -{% include 'emails.footer-text' %}