From d378bb94bea40dd7208df12390989577bbbee0d0 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:29:53 +0200
Subject: [PATCH] Fix: remote servers with port and user

---
 app/Livewire/Boarding/Index.php | 11 ++++++-----
 app/Models/Server.php           | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/Livewire/Boarding/Index.php b/app/Livewire/Boarding/Index.php
index 9503da499..514f00c3a 100644
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@@ -247,11 +247,12 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     public function saveServer()
     {
         $this->validate([
-            'remoteServerName' => 'required',
-            'remoteServerHost' => 'required',
+            'remoteServerName' => 'required|string',
+            'remoteServerHost' => 'required|string',
             'remoteServerPort' => 'required|integer',
-            'remoteServerUser' => 'required',
+            'remoteServerUser' => 'required|string',
         ]);
+
         $this->privateKey = formatPrivateKey($this->privateKey);
         $foundServer = Server::whereIp($this->remoteServerHost)->first();
         if ($foundServer) {
@@ -379,8 +380,8 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             'name' => $this->remoteServerName,
             'port' => $this->remoteServerPort,
             'user' => $this->remoteServerUser,
-                'timezone' => 'UTC',
-            ]);
+            'timezone' => 'UTC',
+        ]);
         $this->validateServer();
     }
 
diff --git a/app/Models/Server.php b/app/Models/Server.php
index d30cdc9d6..46536ed47 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -113,8 +113,13 @@ class Server extends BaseModel
     ];
 
     protected $fillable = [
+        'name',
+        'ip',
         'port',
         'user',
+        'description',
+        'private_key_id',
+        'team_id',
     ];
 
     protected $guarded = [];
@@ -148,11 +153,7 @@ class Server extends BaseModel
 
     public function settings()
     {
-        return $this->hasOne(ServerSetting::class)->withDefault([
-            'force_disabled' => false,
-            'is_reachable' => false,
-            'is_usable' => false,
-        ]);
+        return $this->hasOne(ServerSetting::class);
     }
 
     public function setupDefault404Redirect()