IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Error when blocked user logs in

Browse Source
This commit is contained in:
James Cole 2016-03-18 11:22:58 +01:00
parent d3a3083b85
commit f6303deaa4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Auth/AuthController.php
View File

@ -73,7 +73,7 @@ class AuthController extends Controller
}
// check if user is blocked:
$message = '';
$errorMessage = '';
/** @var User $foundUser */
$foundUser = User::where('email', $credentials['email'])->where('blocked', 1)->first();
if (!is_null($foundUser)) {
@ -83,7 +83,7 @@ class AuthController extends Controller
if (strlen($code) == 0) {
$code = 'general_blocked';
}
$message = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']]));
$errorMessage = strval(trans('firefly.' . $code . '_error', ['email' => $credentials['email']]));
Log::debug('User "'.$credentials['email'].'" found, but code '.$code);
@ -96,7 +96,7 @@ class AuthController extends Controller
'user_id' => $foundUser->id,
'user_address' => $credentials['email'],
'code' => $code,
'message' => $message,
'error_message' => $errorMessage,
'ip' => $request->ip(),
];
Log::debug('Try to send error about user "'.$credentials['email'].'".');
@ -116,7 +116,7 @@ class AuthController extends Controller
$this->incrementLoginAttempts($request);
}
Log::debug('User "'.$credentials['email'].'" return failed login response.');
return $this->sendFailedLoginResponse($request, $message);
return $this->sendFailedLoginResponse($request, $errorMessage);
}
/**

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

@ -16,7 +16,7 @@
The blocked code was "{{ code }}" and the subsequent message was:
</p>
<p style="font-family: monospace;font-size:13px;">
"{{ message }}"
"{{ error_message }}"
</p>
<p style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;font-size:11px;color:#aaa;">

2
resources/views/emails/blocked-login.twig
View File

@ -3,6 +3,6 @@ Hey there,
Firefly III has just blocked a login from user #{{ user_id }} ({{ user_address }}).
The blocked code was "{{ code }}" and the subsequent message was:
"{{ message }}"
"{{ error_message }}"
The login attempt came from IP {{ ip }}