Guest create page: name field autofocus

[bookstack] / app / Console / Commands / RegeneratePermissions.php

diff --git a/app/Console/Commands/RegeneratePermissions.php b/app/Console/Commands/RegeneratePermissions.php
index 4fde08e6b60e515004bdc0f5aea741a7fd44b91e..efb3535d6484ba420fa41e34dc1cf6067f2fc6c5 100644 (file)
--- a/app/Console/Commands/RegeneratePermissions.php
+++ b/app/Console/Commands/RegeneratePermissions.php
@@ -2,8 +2,9 @@
 
 namespace BookStack\Console\Commands;
 
 
 namespace BookStack\Console\Commands;
 

-use BookStack\Auth\Permissions\PermissionService;
+use BookStack\Auth\Permissions\JointPermissionBuilder;

 use Illuminate\Console\Command;
 use Illuminate\Console\Command;

+use Illuminate\Support\Facades\DB;

 
 class RegeneratePermissions extends Command
 {
 
 class RegeneratePermissions extends Command
 {


@@ -21,19 +22,14 @@ class RegeneratePermissions extends Command
      */
     protected $description = 'Regenerate all system permissions';
 
      */
     protected $description = 'Regenerate all system permissions';
 

-    /**
-     * The service to handle the permission system.
-     *
-     * @var PermissionService
-     */
-    protected $permissionService;
+    protected JointPermissionBuilder $permissionBuilder;

 
     /**
      * Create a new command instance.
      */
 
     /**
      * Create a new command instance.
      */

-    public function __construct(PermissionService $permissionService)
+    public function __construct(JointPermissionBuilder $permissionBuilder)

     {
     {

-        $this->permissionService = $permissionService;
+        $this->permissionBuilder = $permissionBuilder;

         parent::__construct();
     }
 
         parent::__construct();
     }
 


@@ -44,15 +40,17 @@ class RegeneratePermissions extends Command
      */
     public function handle()
     {
      */
     public function handle()
     {

-        $connection = \DB::getDefaultConnection();
-        if ($this->option('database') !== null) {
-            \DB::setDefaultConnection($this->option('database'));
-            $this->permissionService->setConnection(\DB::connection($this->option('database')));
+        $connection = DB::getDefaultConnection();
+
+        if ($this->option('database')) {
+            DB::setDefaultConnection($this->option('database'));

         }
 
         }
 

-        $this->permissionService->buildJointPermissions();
+        $this->permissionBuilder->rebuildForAll();

 
 

-        \DB::setDefaultConnection($connection);
+        DB::setDefaultConnection($connection);

         $this->comment('Permissions regenerated');
         $this->comment('Permissions regenerated');

+
+        return 0;

     }
 }
     }
 }