From 9ef24c0a439775fd6df245d1baef47c38c37974a Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 28 Dec 2016 18:54:15 +0100 Subject: [PATCH] Registration process no longer cares about blocked domains or previously deleted users. --- .../Controllers/Auth/RegisterController.php | 49 +------------------ 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 097d912855..4a0ca3ade4 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -20,8 +20,6 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\User; use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Http\Request; -use Log; -use Preferences; use Session; use Validator; @@ -76,26 +74,7 @@ class RegisterController extends Controller $data = $request->all(); $data['password'] = bcrypt($data['password']); - - // 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()); + $user = $this->create($request->all()); // trigger user registration event: 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; - } - }