Make sure roles always use web guard name (#690)

pelican-dev · Oct 29, 2024 · 7a447b0 · 7a447b0
1 parent 3f9c1db
commit 7a447b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/Filament/Resources/RoleResource.php b/app/Filament/Resources/RoleResource.php
@@ -6,7 +6,6 @@
 use App\Enums\RolePermissionPrefixes;
 use App\Filament\Resources\RoleResource\Pages;
 use App\Models\Role;
-use Filament\Facades\Filament;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Component;
@@ -71,7 +70,7 @@ public static function form(Form $form): Form
                     ->disabled(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
                 TextInput::make('guard_name')
                     ->label('Guard Name')
-                    ->default(Filament::getCurrentPanel()?->getAuthGuard() ?? '')
+                    ->default(Role::DEFAULT_GUARD_NAME)
                     ->nullable()
                     ->hidden(),
                 Fieldset::make('Permissions')

diff --git a/app/Models/Role.php b/app/Models/Role.php
@@ -19,6 +19,8 @@ class Role extends BaseRole
 
     public const ROOT_ADMIN = 'Root Admin';
 
+    public const DEFAULT_GUARD_NAME = 'web';
+
     public const MODEL_SPECIFIC_PERMISSIONS = [
         'egg' => [
             'import',
@@ -41,7 +43,7 @@ public function isRootAdmin(): bool
     public static function getRootAdmin(): self
     {
         /** @var self $role */
-        $role = self::findOrCreate(self::ROOT_ADMIN);
+        $role = self::findOrCreate(self::ROOT_ADMIN, self::DEFAULT_GUARD_NAME);
 
         return $role;
     }