diff --git a/Changelog b/Changelog index 947f2a8fa..0571e70cb 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-02-07 DariusIII + * Chg: Add UserServiceObserver and move account verification to it * Chg: Update package.json with new version of Vue (2.6.2) 2019-02-06 DariusIII * Chg: Updated pear/console_getopt (v1.4.1 => v1.4.2) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 9a76737be..2284ac4b4 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -11,12 +11,10 @@ use Illuminate\Http\Request; use Blacklight\utility\Utility; use Spatie\Permission\Models\Role; use App\Http\Controllers\Controller; -use Illuminate\Auth\Events\Registered; use Illuminate\Support\Facades\Password; use Illuminate\Support\Facades\Validator; use Illuminate\Foundation\Auth\RegistersUsers; use Jrean\UserVerification\Traits\VerifiesUsers; -use Jrean\UserVerification\Facades\UserVerification; class RegisterController extends Controller { @@ -82,7 +80,6 @@ class RegisterController extends Controller * @param \Illuminate\Http\Request $request * * @throws \Illuminate\Validation\ValidationException - * @throws \Jrean\UserVerification\Exceptions\ModelNotCompliantException */ public function register(Request $request) { @@ -157,12 +154,6 @@ class RegisterController extends Controller ] ); - event(new Registered($user)); - - UserVerification::generate($user); - - UserVerification::send($user, 'User email verification required'); - return $this->registered($request, $user) ?: redirect($this->redirectPath()); break; diff --git a/app/Observers/UserServiceObserver.php b/app/Observers/UserServiceObserver.php new file mode 100644 index 000000000..a6c4bf894 --- /dev/null +++ b/app/Observers/UserServiceObserver.php @@ -0,0 +1,24 @@ +