From c737788727c413df19eed8b51051ca36e117da7a Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 28 Aug 2023 10:27:56 -0500
Subject: [PATCH] Roles user add fix (#15257)

* Fix user add command doesn't allow roles

* update baseline
---
 app/Console/Commands/AddUserCommand.php | 6 +++---
 phpstan-baseline.neon                   | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/AddUserCommand.php b/app/Console/Commands/AddUserCommand.php
index c9101b9870..520eebfa2a 100644
--- a/app/Console/Commands/AddUserCommand.php
+++ b/app/Console/Commands/AddUserCommand.php
@@ -27,10 +27,10 @@ namespace App\Console\Commands;
 
 use App\Console\LnmsCommand;
 use App\Models\User;
+use Bouncer;
 use Illuminate\Validation\Rule;
 use LibreNMS\Authentication\LegacyAuth;
 use LibreNMS\Config;
-use Silber\Bouncer\Database\Role;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
@@ -68,12 +68,12 @@ class AddUserCommand extends LnmsCommand
             $this->warn(__('commands.user:add.wrong-auth'));
         }
 
-        $roles = Role::pluck('name');
+        $roles = Bouncer::role()->pluck('name');
 
         $this->validate([
             'username' => ['required', Rule::unique('users', 'username')->where('auth_type', 'mysql')],
             'email' => 'nullable|email',
-            'role' => Rule::in($roles->keys()),
+            'role.*' => Rule::in($roles),
         ]);
 
         // set get password
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 5bfa8df0da..7b911a53bd 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -170,6 +170,11 @@ parameters:
 			count: 1
 			path: LibreNMS/Util/Snmpsim.php
 
+		-
+			message: "#^Static method Silber\\\\Bouncer\\\\BouncerFacade\\:\\:role\\(\\) invoked with 0 parameters, 1 required\\.$#"
+			count: 1
+			path: app/Console/Commands/AddUserCommand.php
+
 		-
 			message: "#^Property App\\\\Console\\\\Commands\\\\InternalHttpRequest\\:\\:\\$app is never read, only written\\.$#"
 			count: 1