Set user model straight

Author: mhortulanus

config/backstage/user-management.php config/backstage/user.phpconfig/backstage/user-management.php renamed to config/backstage/user.php

@@ -11,6 +11,6 @@ trait HasLoginsRelation
      */
     public function logins()
     {
-        return $this->hasMany(config('backstage.user-management.eloquent.user_logins.model', \Backstage\UserManagement\Models\UserLogin::class), 'user_id');
+        return $this->hasMany(config('backstage.user.eloquent.user_logins.model', \Backstage\UserManagement\Models\UserLogin::class), 'user_id');
     }
 }

src/Concerns/Relations/HasLoginsRelation.php

@@ -11,6 +11,6 @@ trait HasTraffic
      */
     public function traffic()
     {
-        return $this->hasMany(config('backstage.user-management.eloquent.user_traffic.model', \Backstage\UserManagement\Models\UserTraffic::class), 'user_id');
+        return $this->hasMany(config('backstage.user.eloquent.user_traffic.model', \Backstage\UserManagement\Models\UserTraffic::class), 'user_id');
     }
 }

src/Concerns/Relations/HasTraffic.php

@@ -2,6 +2,7 @@
 
 namespace Backstage\UserManagement\Exports;
 
+use Backstage\UserManagement\Models\User;
 use Filament\Actions\Exports\ExportColumn;
 use Filament\Actions\Exports\Exporter;
 use Filament\Actions\Exports\Models\Export;
@@ -10,7 +11,7 @@ class UserExporter extends Exporter
 {
     public static function getModel(): string
     {
-        return config('backstage.user-management.eloquent.users.model', \App\Models\User::class);
+        return config('backstage.user.eloquent.users.model', User::class);
     }
 
     public static function getColumns(): array

src/Exports/UserExporter.php

@@ -2,7 +2,7 @@
 
 namespace Backstage\UserManagement\Imports;
 
-use App\Models\User;
+use Backstage\UserManagement\Models\User;
 use Filament\Actions\Imports\ImportColumn;
 use Filament\Actions\Imports\Importer;
 use Filament\Actions\Imports\Models\Import;
@@ -11,7 +11,7 @@ class UserImporter extends Importer
 {
     public static function getModel(): string
     {
-        return config('backstage.user-management.eloquent.users.model', \App\Models\User::class);
+        return config('backstage.user.eloquent.users.model', User::class);
     }
 
     public static function getColumns(): array

src/Imports/UserImporter.php

@@ -5,30 +5,32 @@
 use Backstage\UserManagement\Concerns;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Panel;
+use Illuminate\Auth\MustVerifyEmail as MustVerifyEmailTrait;
+use Illuminate\Auth\Passwords\CanResetPassword as CanResetPasswordTrait;
 use Illuminate\Contracts\Auth\CanResetPassword;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Foundation\Auth\User as BaseUser;
 use Illuminate\Notifications\Notifiable;
-use Laravel\Sanctum\Contracts\HasApiTokens as ContractsHasApiTokens;
+use Laravel\Sanctum\Contracts\HasApiTokens as HasApiTokensContract;
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\Permission\Traits\HasRoles;
 
-class User extends Authenticatable implements CanResetPassword, ContractsHasApiTokens, FilamentUser, MustVerifyEmail
+class User extends BaseUser implements CanResetPassword, HasApiTokensContract, FilamentUser, MustVerifyEmail
 {
-    use CanResetPassword;
+    use CanResetPasswordTrait;
     use Concerns\Conditionals\HasConditionals;
     use Concerns\Relations\HasRelations;
     use Concerns\Scopes\HasScopes;
     use HasApiTokens;
     use HasFactory;
     use HasRoles;
-    use MustVerifyEmail;
+    use MustVerifyEmailTrait;
     use Notifiable;
 
     public function getTable()
     {
-        return config('backstage.user-management.eloquent.users.table', 'users');
+        return config('backstage.user.eloquent.users.table', 'users');
     }
 
     /**

src/Models/User.php

@@ -11,7 +11,7 @@ class UserLogin extends Model
 
     public function getTable()
     {
-        return config('backstage.user-management.eloquent.user_logins.table', 'user_logins');
+        return config('backstage.user.eloquent.user_logins.table', 'user_logins');
     }
 
     protected $fillable = [
@@ -32,6 +32,6 @@ public function getTable()
 
     public function user()
     {
-        return $this->belongsTo(config('backstage.user-management.eloquent.users.model', \App\Models\User::class), 'user_id');
+        return $this->belongsTo(config('backstage.user.eloquent.users.model', User::class), 'user_id');
     }
 }

src/Models/UserLogin.php

@@ -26,6 +26,6 @@ class UserTraffic extends Model
 
     public function user(): BelongsTo
     {
-        return $this->belongsTo(config('backstage.user-management.eloquent.users.model', \App\Models\User::class), 'user_id');
+        return $this->belongsTo(config('backstage.user.eloquent.users.model', User::class), 'user_id');
     }
 }

src/Models/UserTraffic.php

@@ -4,6 +4,7 @@
 
 use Backstage\UserManagement\Exports\UserExporter;
 use Backstage\UserManagement\Imports\UserImporter;
+use Backstage\UserManagement\Models\User;
 use Backstage\UserManagement\Resources\UserResource\Pages;
 use Backstage\UserManagement\Widgets\StatsOverviewWidget;
 use Filament\Facades\Filament;
@@ -19,7 +20,7 @@ class UserResource extends Resource
 {
     public static function getModel(): string
     {
-        return config('backstage.user-management.eloquent.users.model', \App\Models\User::class);
+        return config('backstage.user.eloquent.users.model', User::class);
     }
 
     protected static ?string $navigationIcon = 'heroicon-o-user';

src/Resources/UserResource.php

@@ -11,6 +11,7 @@
 use Backstage\UserManagement\Listeners\SendWelcomeMail;
 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;
@@ -30,9 +31,9 @@
 
 class UserManagementServiceProvider extends PackageServiceProvider
 {
-    public static string $name = 'user-management';
+    public static string $name = 'backstage/user';
 
-    public static string $viewNamespace = 'user-management';
+    public static string $viewNamespace = 'backstage/user';
 
     public function configurePackage(Package $package): void
     {
@@ -60,8 +61,7 @@ public function configurePackage(Package $package): void
                 });
             });
 
-        $configFileName = 'backstage/' . $package->shortName();
-
+        $configFileName =  $package->shortName();
         if (file_exists($package->basePath("/../config/{$configFileName}.php"))) {
             $package->hasConfigFile($configFileName);
         }
@@ -125,9 +125,9 @@ public function packageBooted(): void
 
         config(
             'backstage.user-management.users.model',
-            '\App\Models\User'
+            User::class
         )::observe(
-            config('backstage.user-management.eloquent.users.observer', \Backstage\UserManagement\Observers\UserObserver::class)
+            config('backstage.user.eloquent.users.observer', \Backstage\UserManagement\Observers\UserObserver::class)
         );
     }