kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 14:46:37 +00:00
Code Issues Projects Releases Wiki Activity

Removed deprecated event and handlers. (blocked user login)

Browse Source
This commit is contained in:
James Cole
2016-12-28 10:02:43 +01:00
parent 8ccdf9ea83
commit 758953b6e3
6 changed files with 0 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/Events/BlockedUserLogin.php
View File

@@ -1,43 +0,0 @@
<?php
/**
* BlockedUserLogin.php
* Copyright (C) 2016 thegrumpydictator@gmail.com
*
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
declare(strict_types = 1);
namespace FireflyIII\Events;
use FireflyIII\User;
use Illuminate\Queue\SerializesModels;
/**
* Class BlockedUserLogin
*
* @deprecated
* @package FireflyIII\Events
*/
class BlockedUserLogin extends Event
{
use SerializesModels;
public $ipAddress;
public $user;
/**
* Create a new event instance. This event is triggered when a blocked user logs in.
*
* @param User $user
* @param string $ipAddress
*/
public function __construct(User $user, string $ipAddress)
{
$this->user = $user;
$this->ipAddress = $ipAddress;
}
}

41
app/Handlers/Events/UserEventHandler.php
View File

@@ -17,7 +17,6 @@ use Exception;
use FireflyConfig; use FireflyConfig;
use FireflyIII\Events\BlockedUseOfDomain; use FireflyIII\Events\BlockedUseOfDomain;
use FireflyIII\Events\BlockedUseOfEmail; use FireflyIII\Events\BlockedUseOfEmail;
use FireflyIII\Events\BlockedUserLogin;
use FireflyIII\Events\ConfirmedUser; use FireflyIII\Events\ConfirmedUser;
use FireflyIII\Events\DeletedUser; use FireflyIII\Events\DeletedUser;
use FireflyIII\Events\LockedOutUser; use FireflyIII\Events\LockedOutUser;
@@ -82,46 +81,6 @@ class UserEventHandler
return true; 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 * @param LockedOutUser $event
* *

2
app/Http/Controllers/Auth/LoginController.php
View File

@@ -14,7 +14,6 @@ namespace FireflyIII\Http\Controllers\Auth;
use Config; use Config;
use FireflyConfig; use FireflyConfig;
use FireflyIII\Events\BlockedUserLogin;
use FireflyIII\Events\LockedOutUser; use FireflyIII\Events\LockedOutUser;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\User; use FireflyIII\User;
@@ -83,7 +82,6 @@ class LoginController extends Controller
// user exists, but is blocked: // user exists, but is blocked:
$code = strlen(strval($foundUser->blocked_code)) > 0 ? $foundUser->blocked_code : 'general_blocked'; $code = strlen(strval($foundUser->blocked_code)) > 0 ? $foundUser->blocked_code : 'general_blocked';
$errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']])); $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 // If the login attempt was unsuccessful we will increment the number of attempts

4
app/Providers/EventServiceProvider.php
View File

@@ -50,10 +50,6 @@ class EventServiceProvider extends ServiceProvider
[ [
'FireflyIII\Handlers\Events\UserEventHandler@reportLockout', '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. 'FireflyIII\Events\BlockedUseOfEmail' => // is a User related event.
[ [

8
resources/views/emails/blocked-login-html.twig
View File

@@ -1,8 +0,0 @@
{% include 'emails.header-html' %}
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:13px;">
The blocked code was "{{ code }}".
</p>
{% include 'emails.footer-html' %}

5
resources/views/emails/blocked-login-text.twig
View File

@@ -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' %}