Fix permission update issue regarding spatie permissions upgrade v5 t…

…o v6
bluecraank · Oct 25, 2024 · 36c9ef3 · 36c9ef3
1 parent b5f39d4
commit 36c9ef3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -61,15 +61,16 @@ public function update(Request $request, string $id)
             return redirect()->route('users.show', $user->id)->withErrors(['message' =>'You must select a role']);
         }
 
-        // if($user->id == Auth::user()->id) {
-        //     return redirect()->route('users.show', $user->id)->withErrors(['message' => 'You cannot change your own roles']);
-        // }
+        if($user->id == Auth::user()->id) {
+            return redirect()->route('users.show', $user->id)->withErrors(['message' => 'You cannot change your own roles']);
+        }
 
+        $roles = (int) $request->roles;
         // Remove every role
         $user->roles()->detach();
 
         // Add the new roles
-        $user->assignRole($request->roles);
+        $user->assignRole($roles);
 
 
         return redirect()->route('users.show', $user->id)->with('success', 'Roles updated');

diff --git a/app/Http/Middleware/CheckForFirstUser.php b/app/Http/Middleware/CheckForFirstUser.php
@@ -24,7 +24,7 @@ public function handle(Request $request, Closure $next): Response
             if(auth()->user() && auth()->user()->hasRole('Super Administrator')) {
                 return $next($request);
             } elseif(auth()->user() && !auth()->user()->hasRole('Super Administrator')) {
-                auth()->user()->assignRole(Role::findByName('Super Administrator')->first()->id);
+                auth()->user()->assignRole((int) Role::findByName('Super Administrator')->first()->id);
             }
         }