From 884aec9b10484b5cf7a96b6898939a707be21e62 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Thu, 21 Feb 2019 20:34:24 +0100
Subject: [PATCH] Move user role assignment on registration to
 UserServiceObserver

---
 Changelog                                        | 1 +
 app/Http/Controllers/Auth/RegisterController.php | 4 ----
 app/Observers/UserServiceObserver.php            | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 79081c5fc..9a20c6cfe 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2019-02-21 DariusIII
+	* Chg: Move user role assignment on registration to UserServiceObserver
 	* Chg: Update ocramius/package-versions to version 1.4.0
 	* Chg: Update tinymce to version 5.0.1
 	* Chg: Purge accounts that have not logged in and don't have api access for more than 6 months, daily
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 2284ac4b4..02cc0af1d 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -69,10 +69,6 @@ class RegisterController extends Controller
             'userseed' => md5(Str::uuid()->toString()),
         ]);
 
-        $roleName = Role::query()->where('id', $data['roles_id'])->value('name');
-
-        $user->assignRole($roleName);
-
         return $user;
     }
 
diff --git a/app/Observers/UserServiceObserver.php b/app/Observers/UserServiceObserver.php
index 9345ad883..043a61fd5 100644
--- a/app/Observers/UserServiceObserver.php
+++ b/app/Observers/UserServiceObserver.php
@@ -7,6 +7,7 @@ use App\Jobs\SendWelcomeEmail;
 use App\Jobs\SendAccountDeletedEmail;
 use App\Jobs\SendNewRegisteredAccountMail;
 use Jrean\UserVerification\Facades\UserVerification;
+use Spatie\Permission\Models\Role;
 
 class UserServiceObserver
 {
@@ -20,6 +21,8 @@ class UserServiceObserver
      */
     public function created(User $user)
     {
+        $roleName = Role::query()->where('id', $user->roles_id)->value('name');
+        $user->assignRole($roleName);
         SendNewRegisteredAccountMail::dispatch($user);
         SendWelcomeEmail::dispatch($user);
         UserVerification::generate($user);