From 7a3fcd37d5b5057523aa5107d986f209b29d5403 Mon Sep 17 00:00:00 2001
From: Aditya Tripathi <aditya@climactic.co>
Date: Thu, 21 May 2026 10:24:49 +0000
Subject: [PATCH] fix(livewire): scope DatabaseProxyStopped to proxy fields,
 harden status trait

Clickhouse, Dragonfly, and Keydb still called syncData() inside the
DatabaseProxyStopped broadcast handler, clobbering in-progress edits to
name/description/credentials. Refresh only is_public/public_port/
public_port_timeout instead, matching the pattern used elsewhere.

Also null-guard HasDatabaseStatusInfo::getListeners() against an absent
Auth::user()/currentTeam(), add explicit return types on getListeners()
and render(), and convert inline comments in the SSL refresh test to a
PHPDoc block.
---
 .../Project/Database/Clickhouse/General.php   |  7 +++--
 .../Project/Database/Dragonfly/General.php    |  7 +++--
 .../Project/Database/Keydb/General.php        |  7 +++--
 app/Traits/HasDatabaseStatusInfo.php          | 26 ++++++++++++-------
 .../Feature/DatabaseSslStatusRefreshTest.php  |  8 +++---
 5 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/app/Livewire/Project/Database/Clickhouse/General.php b/app/Livewire/Project/Database/Clickhouse/General.php
index b5c0ffff4..857300926 100644
--- a/app/Livewire/Project/Database/Clickhouse/General.php
+++ b/app/Livewire/Project/Database/Clickhouse/General.php
@@ -192,9 +192,12 @@ public function instantSave()
         }
     }
 
-    public function databaseProxyStopped()
+    public function databaseProxyStopped(): void
     {
-        $this->syncData();
+        $this->database->refresh();
+        $this->isPublic = $this->database->is_public;
+        $this->publicPort = $this->database->public_port;
+        $this->publicPortTimeout = $this->database->public_port_timeout;
         $this->dispatch('databaseUpdated');
     }
 
diff --git a/app/Livewire/Project/Database/Dragonfly/General.php b/app/Livewire/Project/Database/Dragonfly/General.php
index 5f57693b1..01a474761 100644
--- a/app/Livewire/Project/Database/Dragonfly/General.php
+++ b/app/Livewire/Project/Database/Dragonfly/General.php
@@ -184,9 +184,12 @@ public function instantSave()
         }
     }
 
-    public function databaseProxyStopped()
+    public function databaseProxyStopped(): void
     {
-        $this->syncData();
+        $this->database->refresh();
+        $this->isPublic = $this->database->is_public;
+        $this->publicPort = $this->database->public_port;
+        $this->publicPortTimeout = $this->database->public_port_timeout;
         $this->dispatch('databaseUpdated');
     }
 
diff --git a/app/Livewire/Project/Database/Keydb/General.php b/app/Livewire/Project/Database/Keydb/General.php
index 1c5c828a3..6031cb7ac 100644
--- a/app/Livewire/Project/Database/Keydb/General.php
+++ b/app/Livewire/Project/Database/Keydb/General.php
@@ -189,9 +189,12 @@ public function instantSave()
         }
     }
 
-    public function databaseProxyStopped()
+    public function databaseProxyStopped(): void
     {
-        $this->syncData();
+        $this->database->refresh();
+        $this->isPublic = $this->database->is_public;
+        $this->publicPort = $this->database->public_port;
+        $this->publicPortTimeout = $this->database->public_port_timeout;
         $this->dispatch('databaseUpdated');
     }
 
diff --git a/app/Traits/HasDatabaseStatusInfo.php b/app/Traits/HasDatabaseStatusInfo.php
index 98c939b7e..e46cccf0c 100644
--- a/app/Traits/HasDatabaseStatusInfo.php
+++ b/app/Traits/HasDatabaseStatusInfo.php
@@ -5,6 +5,7 @@
 use App\Helpers\SslHelper;
 use Carbon\Carbon;
 use Exception;
+use Illuminate\Contracts\View\View;
 use Illuminate\Support\Facades\Auth;
 
 /**
@@ -51,16 +52,23 @@ protected function showPublicUrlPlaceholder(): bool
         return false;
     }
 
-    public function getListeners()
+    public function getListeners(): array
     {
-        $userId = Auth::id();
-        $teamId = Auth::user()->currentTeam()->id;
+        $listeners = ['databaseUpdated' => 'refresh'];
 
-        return [
-            "echo-private:user.{$userId},DatabaseStatusChanged" => 'refresh',
-            "echo-private:team.{$teamId},ServiceChecked" => 'refresh',
-            'databaseUpdated' => 'refresh',
-        ];
+        $user = Auth::user();
+        if (! $user) {
+            return $listeners;
+        }
+
+        $listeners["echo-private:user.{$user->id},DatabaseStatusChanged"] = 'refresh';
+
+        $team = $user->currentTeam();
+        if ($team) {
+            $listeners["echo-private:team.{$team->id},ServiceChecked"] = 'refresh';
+        }
+
+        return $listeners;
     }
 
     public function mount(): void
@@ -150,7 +158,7 @@ public function regenerateSslCertificate(): void
         }
     }
 
-    public function render()
+    public function render(): View
     {
         return view('livewire.project.database.status-info', [
             'label' => $this->databaseLabel(),
diff --git a/tests/Feature/DatabaseSslStatusRefreshTest.php b/tests/Feature/DatabaseSslStatusRefreshTest.php
index 7b0e4c0a3..7efb03789 100644
--- a/tests/Feature/DatabaseSslStatusRefreshTest.php
+++ b/tests/Feature/DatabaseSslStatusRefreshTest.php
@@ -78,11 +78,13 @@
         ->not->toHaveKey("echo-private:team.{$this->team->id},ServiceStatusChanged");
 })->with('database-general-forms-without-broadcasts');
 
+/**
+ * Resolve a Livewire component's listeners regardless of whether the subclass
+ * exposes getListeners() publicly or only declares a $listeners array — the
+ * HandlesEvents trait keeps getListeners() protected by default.
+ */
 function resolveLivewireListeners(object $component): array
 {
-    // Livewire's HandlesEvents trait declares getListeners() as protected,
-    // so subclasses that override it as public are callable directly, but
-    // subclasses that rely on $listeners are not. Reflection handles both.
     $method = new ReflectionMethod($component, 'getListeners');
     $method->setAccessible(true);