Merge branch 'main' of github.com:backstagephp/users

Author: mhortulanus

src/Concerns/Scopes/IsVerfiedScope.php

@@ -4,13 +4,11 @@
 
 use Illuminate\Database\Eloquent\Builder;
 
-
 trait IsVerfiedScope
 {
     /**
      * Scope a query to only include verified users.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeVerified(Builder $query)
@@ -22,12 +20,11 @@ public function scopeVerified(Builder $query)
     /**
      * Scope a query to only include unverified users.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function scopeUnverified(Builder $query)
     {
-        return  $query->where('email_verified_at', null)
+        return $query->where('email_verified_at', null)
             ->orWhere('password', null);
     }
 }

src/Models/User.php

@@ -5,7 +5,6 @@
 use Backstage\UserManagement\Concerns;
 use Backstage\UserManagement\Scopes\VerifiedUser;
 use Filament\Models\Contracts\FilamentUser;
-use Filament\Pages\SubNavigationPosition;
 use Filament\Panel;
 use Illuminate\Auth\MustVerifyEmail as MustVerifyEmailTrait;
 use Illuminate\Auth\Passwords\CanResetPassword as CanResetPasswordTrait;

src/Notifications/Invitation.php

@@ -4,7 +4,6 @@
 
 use Backstage\UserManagement\Models\User;
 use Backstage\UserManagement\Pages\RegisterFromInvitationPage;
-use Filament\Facades\Filament;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;

src/Pages/RegisterFromInvitationPage.php

@@ -3,32 +3,27 @@
 namespace Backstage\UserManagement\Pages;
 
 use Backstage\UserManagement\Models\User;
-use Filament\Pages\Page;
 use Filament\Actions\Action;
-use Filament\Facades\Filament;
-use Filament\Pages\Auth\Register;
 use Filament\Events\Auth\Registered;
-use Illuminate\Support\Facades\Hash;
-use Filament\Actions\Concerns\HasForm;
-use Filament\Forms\Contracts\HasForms;
-use Illuminate\Database\Eloquent\Model;
+use Filament\Facades\Filament;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\TextInput;
-use Illuminate\Validation\Rules\Password;
-use Illuminate\Contracts\Support\Htmlable;
 use Filament\Forms\Concerns\InteractsWithForms;
-use Filament\Panel\Concerns\HasDatabaseTransactions;
-use Filament\Pages\Concerns\InteractsWithFormActions;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Pages\Auth\Register;
 use Filament\Pages\Concerns\CanUseDatabaseTransactions;
-use Filament\Http\Responses\Auth\Contracts\RegistrationResponse;
-use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
-use Illuminate\Http\RedirectResponse;
+use Filament\Pages\Concerns\InteractsWithFormActions;
+use Filament\Pages\Page;
+use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\Rules\Password;
 
 class RegisterFromInvitationPage extends Page implements HasForms
 {
-    use InteractsWithForms;
-    use InteractsWithFormActions;
     use CanUseDatabaseTransactions;
+    use InteractsWithFormActions;
+    use InteractsWithForms;
 
     protected static ?string $slug = '/{userId}';
 
@@ -39,10 +34,10 @@ class RegisterFromInvitationPage extends Page implements HasForms
     public $userModel = null;
 
     public User $user;
-    
+
     public array $data = [];
 
-    public function getTitle(): string|Htmlable
+    public function getTitle(): string | Htmlable
     {
         return __('filament-panels::pages/auth/register.title');
     }
@@ -69,8 +64,7 @@ public static function hasLogo()
     public function getForms(): array
     {
         return [
-            'registerForm' =>
-            $this->makeForm()
+            'registerForm' => $this->makeForm()
                 ->model($this->getUserModel())
                 ->schema([
                     $this->getNameFormComponent(),
@@ -111,7 +105,7 @@ protected function getPasswordFormComponent(): Component
             ->revealable(filament()->arePasswordsRevealable())
             ->required()
             ->rule(Password::default())
-            ->dehydrateStateUsing(fn($state) => Hash::make($state))
+            ->dehydrateStateUsing(fn ($state) => Hash::make($state))
             ->same('passwordConfirmation')
             ->validationAttribute(__('filament-panels::pages/auth/register.form.password.validation_attribute'));
     }
@@ -155,14 +149,11 @@ public function getRegisterFormAction(): Action
             ->submit('register');
     }
 
-
     protected function hasFullWidthFormActions(): bool
     {
         return true;
     }
 
-
-
     // Register
     public function register()
     {
@@ -193,7 +184,6 @@ public function register()
         return $this->redirect($defaultPanel->getUrl());
     }
 
-
     protected function handleRegistration(array $data): Model
     {
         $this->user->password = $data['password'];

src/RegisterUserPanelProvider.php

@@ -3,15 +3,12 @@
 namespace Backstage\UserManagement;
 
 use Backstage\UserManagement\Pages\RegisterFromInvitationPage;
-use Filament\Http\Middleware\Authenticate;
 use Filament\Http\Middleware\AuthenticateSession;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
-use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
 use Filament\Support\Colors\Color;
-use Filament\Widgets;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Cookie\Middleware\EncryptCookies;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
@@ -30,7 +27,7 @@ public function panel(Panel $panel): Panel
                 'primary' => Color::Amber,
             ])
             ->pages([
-               RegisterFromInvitationPage::class,
+                RegisterFromInvitationPage::class,
             ])
             ->middleware([
                 EncryptCookies::class,

src/Resources/UserResource.php

@@ -2,21 +2,18 @@
 
 namespace Backstage\UserManagement\Resources;
 
+use Backstage\UserManagement\Exports\UserExporter;
+use Backstage\UserManagement\Imports\UserImporter;
+use Backstage\UserManagement\Models\User;
+use Backstage\UserManagement\Resources\UserResource\Pages;
+use Backstage\UserManagement\Scopes\VerifiedUser;
+use Backstage\UserManagement\Widgets\StatsOverviewWidget;
 use Filament\Forms;
-use Filament\Tables;
 use Filament\Forms\Form;
-use Filament\Tables\Table;
-use Filament\Facades\Filament;
 use Filament\Resources\Resource;
-use Illuminate\Support\Facades\Hash;
-use Backstage\UserManagement\Models\User;
+use Filament\Tables;
+use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Validation\Rules\Password;
-use Backstage\UserManagement\Scopes\VerifiedUser;
-use Backstage\UserManagement\Exports\UserExporter;
-use Backstage\UserManagement\Imports\UserImporter;
-use Backstage\UserManagement\Widgets\StatsOverviewWidget;
-use Backstage\UserManagement\Resources\UserResource\Pages;
 
 class UserResource extends Resource
 {

src/Resources/UserResource/Pages/ListUsers.php

@@ -32,12 +32,12 @@ public function getTabs(): array
             Tab::make(__('Users'))
                 ->badge(static::getResource()::getEloquentQuery()->verified()->count())
                 ->badgeColor(Color::Green)
-                ->modifyQueryUsing(fn($query) => $query->verified()),
+                ->modifyQueryUsing(fn ($query) => $query->verified()),
 
             Tab::make(__('Pending'))
                 ->badge(static::getResource()::getEloquentQuery()->unverified()->count())
                 ->badgeColor(Color::Red)
-                ->modifyQueryUsing(fn($query) => $query->unverified()),
+                ->modifyQueryUsing(fn ($query) => $query->unverified()),
         ];
     }
 }

src/Scopes/VerifiedUser.php

@@ -2,7 +2,6 @@
 
 namespace Backstage\UserManagement\Scopes;
 
-use Backstage\UserManagement\Models\User;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Scope;

src/UserManagementServiceProvider.php

@@ -2,33 +2,32 @@
 
 namespace Backstage\UserManagement;
 
-use Filament\Support\Assets\Js;
+use Backstage\UserManagement\Commands\UserManagementCommand;
+use Backstage\UserManagement\Events\UserCreated;
+use Backstage\UserManagement\Events\WebTrafficDetected;
+use Backstage\UserManagement\Listeners\Permissions\LogRoleAttached;
+use Backstage\UserManagement\Listeners\Permissions\LogRoleDetached;
+use Backstage\UserManagement\Listeners\RecordUserMovements;
+use Backstage\UserManagement\Listeners\SendInvitationMail;
+use Backstage\UserManagement\Listeners\UserLogin;
+use Backstage\UserManagement\Listeners\UserLogout;
+use Backstage\UserManagement\Models\User;
+use Backstage\UserManagement\Testing\TestsUserManagement;
+use Filament\Support\Assets\AlpineComponent;
+use Filament\Support\Assets\Asset;
 use Filament\Support\Assets\Css;
+use Filament\Support\Assets\Js;
+use Filament\Support\Facades\FilamentAsset;
+use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Auth\Events\Login;
-use Filament\Support\Assets\Asset;
 use Illuminate\Auth\Events\Logout;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Event;
-use Spatie\LaravelPackageTools\Package;
-use Backstage\UserManagement\Models\User;
-use Filament\Support\Facades\FilamentIcon;
-use Filament\Support\Facades\FilamentAsset;
-use Filament\Support\Assets\AlpineComponent;
 use Livewire\Features\SupportTesting\Testable;
-use Backstage\UserManagement\Events\UserCreated;
-use Backstage\UserManagement\Listeners\UserLogin;
-use Spatie\Permission\Events as PermissionEvents;
-use Backstage\UserManagement\Listeners\UserLogout;
-use Spatie\LaravelPackageTools\PackageServiceProvider;
-use Backstage\UserManagement\Events\WebTrafficDetected;
-use Backstage\UserManagement\Listeners\SendWelcomeMail;
 use Spatie\LaravelPackageTools\Commands\InstallCommand;
-use Backstage\UserManagement\Testing\TestsUserManagement;
-use Backstage\UserManagement\Listeners\SendInvitationMail;
-use Backstage\UserManagement\Listeners\RecordUserMovements;
-use Backstage\UserManagement\Commands\UserManagementCommand;
-use Backstage\UserManagement\Listeners\Permissions\LogRoleAttached;
-use Backstage\UserManagement\Listeners\Permissions\LogRoleDetached;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
+use Spatie\Permission\Events as PermissionEvents;
 
 class UserManagementServiceProvider extends PackageServiceProvider
 {
@@ -70,17 +69,16 @@ public function configurePackage(Package $package): void
                     ]);
 
                     $command->call('vendor:publish', [
-                        '--tag' => 'filament-actions-migrations'
+                        '--tag' => 'filament-actions-migrations',
                     ]);
 
                     $command->call('migrate');
                 });
             });
 
-        if (file_exists($package->basePath("/../config/backstage/users.php"))) {
+        if (file_exists($package->basePath('/../config/backstage/users.php'))) {
             $package->hasConfigFile('backstage/users');
 
-
             if (file_exists($package->basePath('/../database/migrations'))) {
                 $package->hasMigrations($this->getMigrations());
             }
@@ -94,7 +92,7 @@ public function configurePackage(Package $package): void
             }
         }
     }
-    
+
     public function packageRegistered(): void {}
 
     public function packageBooted(): void
@@ -212,7 +210,7 @@ protected function getMigrations(): array
             'create_users_tags_pivot_table',
             'create_users_tags_table',
             'user_password_nullable',
-            'add_sub_navigation_preference_to_users_table'
+            'add_sub_navigation_preference_to_users_table',
         ];
     }
 }

src/Widgets/StatsOverviewWidget.php

@@ -26,14 +26,14 @@ protected function getStats(): array
                     ->selectRaw('DATE(created_at) as day, COUNT(*) as count')
                     ->groupBy('day')
                     ->get()
-                    ->avg('count'), 0,2),
+                    ->avg('count'), 0, 2),
             ),
 
             Stat::make(__('Verified Users'), UserResource::getEloquentQuery()->where('email_verified_at', '!=', null)->count())
                 ->color(Color::Green)
                 ->icon('heroicon-o-check-circle'),
 
-                Stat::make(__('Pending Users'), UserResource::getEloquentQuery()->where('email_verified_at', null)->count())
+            Stat::make(__('Pending Users'), UserResource::getEloquentQuery()->where('email_verified_at', null)->count()),
         ];
     }
 }