diff --git a/app/Http/Controllers/Admin/DomainController.php b/app/Http/Controllers/Admin/DomainController.php deleted file mode 100644 index 2115d5816d..0000000000 --- a/app/Http/Controllers/Admin/DomainController.php +++ /dev/null @@ -1,140 +0,0 @@ -data; - - // known domains - $knownDomains = $this->getKnownDomains(); - - return view('admin.domains.index', compact('title', 'mainTitleIcon', 'knownDomains', 'subTitle', 'subTitleIcon', 'domains')); - } - - - /** - * @param Request $request - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function manual(Request $request) - { - if (strlen($request->get('domain')) === 0) { - Session::flash('error', trans('firefly.no_domain_filled_in')); - - return redirect(route('admin.users.domains')); - } - - $domain = strtolower($request->get('domain')); - $blocked = FireflyConfig::get('blocked-domains', [])->data; - - if (in_array($domain, $blocked)) { - Session::flash('error', trans('firefly.domain_already_blocked', ['domain' => $domain])); - - return redirect(route('admin.users.domains')); - } - $blocked[] = $domain; - FireflyConfig::set('blocked-domains', $blocked); - - Session::flash('success', trans('firefly.domain_is_now_blocked', ['domain' => $domain])); - - return redirect(route('admin.users.domains')); - } - - /** - * @param string $domain - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function toggleDomain(string $domain) - { - $domain = strtolower($domain); - $blocked = FireflyConfig::get('blocked-domains', [])->data; - - if (in_array($domain, $blocked)) { - $key = array_search($domain, $blocked); - unset($blocked[$key]); - sort($blocked); - - FireflyConfig::set('blocked-domains', $blocked); - Session::flash('message', trans('firefly.domain_now_unblocked', ['domain' => $domain])); - - - return redirect(route('admin.users.domains')); - - } - - $blocked[] = $domain; - - FireflyConfig::set('blocked-domains', $blocked); - Session::flash('message', trans('firefly.domain_now_blocked', ['domain' => $domain])); - - return redirect(route('admin.users.domains')); - } - - /** - * @return array - */ - private function getKnownDomains(): array - { - /** @var UserRepositoryInterface $repository */ - $repository = app(UserRepositoryInterface::class); - $users = $repository->all(); - $set = []; - $filtered = []; - /** @var User $user */ - foreach ($users as $user) { - $email = $user->email; - $parts = explode('@', $email); - $set[] = strtolower($parts[1]); - } - $set = array_unique($set); - // filter for already banned domains: - $blocked = FireflyConfig::get('blocked-domains', [])->data; - - foreach ($set as $domain) { - // in the block array? ignore it. - if (!in_array($domain, $blocked)) { - $filtered[] = $domain; - } - } - - return $filtered; - } -} diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 4a0ca3ade4..2cf28042ba 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -72,9 +72,7 @@ class RegisterController extends Controller $this->throwValidationException($request, $validator); } - $data = $request->all(); - $data['password'] = bcrypt($data['password']); - $user = $this->create($request->all()); + $user = $this->create($request->all()); // trigger user registration event: event(new RegisteredUser($user, $request->ip())); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 53a4eb861f..04e2386198 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -832,18 +832,6 @@ return [ 'user_administration' => 'User administration', 'list_all_users' => 'All users', 'all_users' => 'All users', - 'all_blocked_domains' => 'All blocked domains', - 'blocked_domains' => 'Blocked domains', - 'no_domains_banned' => 'No domains blocked', - 'all_user_domains' => 'All user email address domains', - 'all_domains_is_filtered' => 'This list does not include already blocked domains.', - 'domain_now_blocked' => 'Domain :domain is now blocked', - 'domain_now_unblocked' => 'Domain :domain is now unblocked', - 'manual_block_domain' => 'Block a domain by hand', - 'block_domain' => 'Block domain', - 'no_domain_filled_in' => 'No domain filled in', - 'domain_already_blocked' => 'Domain :domain is already blocked', - 'domain_is_now_blocked' => 'Domain :domain is now blocked', 'instance_configuration' => 'Configuration', 'firefly_instance_configuration' => 'Configuration options for Firefly III', 'setting_single_user_mode' => 'Single user mode', diff --git a/resources/views/admin/domains/index.twig b/resources/views/admin/domains/index.twig deleted file mode 100644 index 2ea2a88005..0000000000 --- a/resources/views/admin/domains/index.twig +++ /dev/null @@ -1,122 +0,0 @@ -{% extends "./layout/default" %} - -{% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists }} -{% endblock %} -{% block content %} -
-
-
-
-

{{ 'all_blocked_domains'|_ }}

-
-
- {% if domains|length > 0 %} - - - - - - - - - {% for domain in domains %} - - - - - {% endfor %} - -
 {{ trans('list.domain') }}
- unblock - - {{ domain }} - (whois) -
- {% else %} -

- {{ 'no_domains_banned'|_ }} -

- {% endif %} -
-
-
- - -
-
-
-

{{ 'all_user_domains'|_ }}

-
-
- {% if knownDomains|length > 0 %} -

- {{ 'all_domains_is_filtered'|_ }} - -

- - - - - - - - - {% for domain in knownDomains %} - - - - - - {% endfor %} - -
 {{ trans('list.domain') }}
block{{ domain }}
- {% else %} -

- {{ 'no_domains_banned'|_ }} -

- {% endif %} -
-
-
-
- - -
-
-
-
-

{{ 'manual_block_domain'|_ }}

-
-
- -
-
- -
- - - - {{ ExpandedForm.text('domain') }} - - - -
- -
-
-
-
-
-
- - -{% endblock %} -{% block styles %} - -{% endblock %} -{% block scripts %} - -{% endblock %} diff --git a/resources/views/admin/index.twig b/resources/views/admin/index.twig index 8ca383246f..2edd7c681e 100644 --- a/resources/views/admin/index.twig +++ b/resources/views/admin/index.twig @@ -28,8 +28,6 @@
diff --git a/routes/web.php b/routes/web.php index f78f062798..d619a909bb 100755 --- a/routes/web.php +++ b/routes/web.php @@ -684,11 +684,6 @@ Route::group( Route::get('users/show/{user}', ['uses' => 'UserController@show', 'as' => 'users.show']); Route::post('users/update/{user}', ['uses' => 'UserController@update', 'as' => 'users.update']); - // user domain manager - Route::get('domains', ['uses' => 'DomainController@domains', 'as' => 'users.domains']); - Route::get('domains/toggle/{domain}', ['uses' => 'DomainController@toggleDomain', 'as' => 'users.domains.block-toggle']); - Route::post('domains/manual', ['uses' => 'DomainController@manual', 'as' => 'users.domains.manual']); - // FF configuration: Route::get('configuration', ['uses' => 'ConfigurationController@index', 'as' => 'configuration.index']); Route::post('configuration', ['uses' => 'ConfigurationController@postIndex', 'as' => 'configuration.index.post']); diff --git a/tests/acceptance/Controllers/Admin/DomainControllerTest.php b/tests/acceptance/Controllers/Admin/DomainControllerTest.php deleted file mode 100644 index bba83a9265..0000000000 --- a/tests/acceptance/Controllers/Admin/DomainControllerTest.php +++ /dev/null @@ -1,68 +0,0 @@ -be($this->user()); - $this->call('GET', route('admin.users.domains')); - $this->assertResponseStatus(200); - - // has bread crumb - $this->see('
    '); - } - - /** - * @covers \FireflyIII\Http\Controllers\Admin\DomainController::manual - */ - public function testManual() - { - $this->be($this->user()); - $this->call('POST', route('admin.users.domains.manual'), ['domain' => 'example2.com']); - $this->assertSessionHas('success'); - $this->assertResponseStatus(302); - } - - /** - * @covers \FireflyIII\Http\Controllers\Admin\DomainController::toggleDomain - */ - public function testToggleDomain() - { - $this->be($this->user()); - $this->call('GET', route('admin.users.domains.block-toggle', ['example.com'])); - $this->assertSessionHas('message'); - $this->assertResponseStatus(302); - } - -}