Login-Link, User Session and some improvements to User Device (#516)

Author: mooxbot

resources/lang/en/translations.php

@@ -13,7 +13,7 @@
     'created_at' => 'Created at',
     'updated_at' => 'Last login',
     'active' => 'Active',
-    'user_type' => 'Model',
+    'user_type' => 'User Model',
     'username' => 'Username',
     'slug' => 'Slug',
 ];

src/Listeners/StoreUserDevice.php

@@ -5,7 +5,6 @@
 use GeoIp2\Database\Reader;
 use Illuminate\Auth\Events\Login;
 use Illuminate\Http\Request;
-use Illuminate\Support\Str;
 use Jenssegers\Agent\Agent;
 use Moox\UserDevice\Models\UserDevice;
 use Moox\UserDevice\Services\LocationService;
@@ -42,16 +41,13 @@ public function handle(Login $event)
 
         $title = $platform.' '.$browser.' on '.$os.' in '.($location['city'] ?? '- Unknown').' - '.($location['country'] ?? null);
 
-        $slug = Str::slug($title);
-
         $device = UserDevice::updateOrCreate([
             'user_id' => $user_id,
             'user_type' => get_class($user),
             'ip_address' => $ipAddress,
             'user_agent' => $userAgent,
         ], [
             'title' => $title,
-            'slug' => $slug,
             'active' => true,
             'os' => $os,
             'platform' => $platform,

src/Models/UserDevice.php

@@ -10,8 +10,25 @@ class UserDevice extends Model
     protected $table = 'user_devices';
 
     protected $fillable = [
-        'title', 'slug', 'user_id', 'user_type', 'user_agent',
-        'platform', 'os', 'browser', 'city', 'country', 'location', 'whitelisted', 'active', 'ip_address',
+        'title',
+        'slug',
+        'user_id',
+        'user_type',
+        'user_agent',
+        'platform',
+        'os',
+        'browser',
+        'city',
+        'country',
+        'location',
+        'whitelisted',
+        'active',
+        'ip_address',
+    ];
+
+    protected $casts = [
+        'active' => 'bool',
+        'whitelisted' => 'bool',
     ];
 
     /**
@@ -21,9 +38,17 @@ protected static function boot()
     {
         parent::boot();
 
-        // Automatically generate a slug when creating a new device.
-        static::creating(function ($device) {
-            $device->slug = Str::slug($device->title);
+        UserDevice::creating(function ($item) {
+            $baseSlug = Str::slug($item->title);
+            $slug = $baseSlug;
+            $counter = 1;
+
+            while (UserDevice::where('slug', $slug)->exists()) {
+                $slug = "{$baseSlug}-{$counter}";
+                $counter++;
+            }
+
+            $item->slug = $slug;
         });
     }
 

src/Resources/UserDeviceResource.php

@@ -24,7 +24,7 @@ class UserDeviceResource extends Resource
 {
     protected static ?string $model = UserDevice::class;
 
-    protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';
+    protected static ?string $navigationIcon = 'heroicon-o-computer-desktop';
 
     public static function form(Form $form): Form
     {