kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-21 19:47:48 +00:00
Code Issues Projects Releases Wiki Activity

Can block certain domains from registering, such as ten-minute-mail services. Two example domains provided in configuration.

Browse Source
This commit is contained in:
James Cole
2015-12-03 11:17:48 +01:00
parent d4e759754d
commit 56c08d8302
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ use Session;
use Twig;
use Validator;
use Log;
use Config;
/**
* Class AuthController
@@ -88,8 +89,8 @@ class AuthController extends Controller
$foundUser = User::where('email', $credentials['email'])->where('blocked', 1)->first();
if (!is_null($foundUser)) {
// if it exists, show message:
$code = $foundUser->blocked_code;
if(strlen($code) == 0) {
$code = $foundUser->blocked_code;
if (strlen($code) == 0) {
$code = 'general_blocked';
}
$message = trans('firefly.' . $code . '_error', ['email' => $credentials['email']]);
@@ -160,9 +161,20 @@ class AuthController extends Controller
}
// @codeCoverageIgnoreEnd
$data = $request->all();
$data['password'] = bcrypt($data['password']);
// is user email domain blocked?
$parts = explode('@', $data['email']);
if (isset($parts[1]) && in_array($parts[1], Config::get('mail.blocked_domains'))) {
$validator->getMessageBag()->add('email', trans('validation.invalid_domain'));
$this->throwValidationException(
$request, $validator
);
}
Auth::login($this->create($data));
// get the email address