kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-06 12:45:30 +00:00
Code Issues Projects Releases Wiki Activity

Registration process no longer cares about blocked domains or previously deleted users.

Browse Source
This commit is contained in:
James Cole
2016-12-28 18:54:15 +01:00
parent 7ee650ba7a
commit 9ef24c0a43
1 changed files with 1 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -20,8 +20,6 @@ use FireflyIII\Http\Controllers\Controller;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Log;
use Preferences;
use Session; use Session;
use Validator; use Validator;
@@ -76,26 +74,7 @@ class RegisterController extends Controller
$data = $request->all(); $data = $request->all();
$data['password'] = bcrypt($data['password']); $data['password'] = bcrypt($data['password']);
$user = $this->create($request->all());
// is user email domain blocked?
if ($this->isBlockedDomain($data['email'])) {
$validator->getMessageBag()->add('email', (string)trans('validation.invalid_domain'));
$this->throwValidationException($request, $validator);
}
// is user a deleted user?
$hash = hash('sha256', $data['email']);
$configuration = FireflyConfig::get('deleted_users', []);
$set = $configuration->data;
Log::debug(sprintf('Hash of email is %s', $hash));
Log::debug('Hashes of deleted users: ', $set);
if (in_array($hash, $set)) {
$validator->getMessageBag()->add('email', (string)trans('validation.deleted_user'));
$this->throwValidationException($request, $validator);
}
$user = $this->create($request->all());
// trigger user registration event: // trigger user registration event:
event(new RegisteredUser($user, $request->ip())); event(new RegisteredUser($user, $request->ip()));
@@ -169,30 +148,4 @@ class RegisterController extends Controller
] ]
); );
} }
/**
* @return array
*/
private function getBlockedDomains()
{
return FireflyConfig::get('blocked-domains', [])->data;
}
/**
* @param string $email
*
* @return bool
*/
private function isBlockedDomain(string $email)
{
$parts = explode('@', $email);
$blocked = $this->getBlockedDomains();
if (isset($parts[1]) && in_array($parts[1], $blocked)) {
return true;
}
return false;
}
} }