No longer able to manage blocked domains.

app/Http/Controllers/Admin/DomainController.php

@@ -1,140 +0,0 @@
-<?php
-/**
- * DomainController.php
- * Copyright (C) 2016 thegrumpydictator@gmail.com
- *
- * This software may be modified and distributed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International License.
- *
- * See the LICENSE file for details.
- */
-
-declare(strict_types = 1);
-
-namespace FireflyIII\Http\Controllers\Admin;
-
-
-use FireflyIII\Http\Controllers\Controller;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
-use FireflyIII\Support\Facades\FireflyConfig;
-use FireflyIII\User;
-use Illuminate\Http\Request;
-use Session;
-
-/**
- * Class DomainController
- *
- * @package FireflyIII\Http\Controllers\Admin
- */
-class DomainController extends Controller
-{
-
-    /**
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function domains()
-    {
-
-        $title         = strval(trans('firefly.administration'));
-        $mainTitleIcon = 'fa-hand-spock-o';
-        $subTitle      = strval(trans('firefly.blocked_domains'));
-        $subTitleIcon  = 'fa-exclamation-circle';
-        $domains       = FireflyConfig::get('blocked-domains', [])->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;
-    }
-}

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()));