From c6e13e60b5214bb2892321d50fb38101a67846c2 Mon Sep 17 00:00:00 2001
From: Saeed Vaziry <mr.saeedvaziry@gmail.com>
Date: Wed, 28 Jan 2026 00:07:11 +0100
Subject: [PATCH] Fix git hook failing to destroy

---
 app/Models/GitHook.php                        | 15 ++++++-----
 app/Models/Site.php                           |  8 +-----
 resources/js/pages/databases/index.tsx        |  2 +-
 .../js/pages/sites/components/create-site.tsx |  4 +--
 tests/Feature/ApplicationTest.php             | 26 +++++++++++++++++++
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/app/Models/GitHook.php b/app/Models/GitHook.php
index d9ada2a3e..a3b26c5bc 100755
--- a/app/Models/GitHook.php
+++ b/app/Models/GitHook.php
@@ -6,6 +6,7 @@
 use Database\Factories\GitHookFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Facades\Log;
 
 /**
  * @property int $site_id
@@ -64,14 +65,16 @@ public function deployHook(): void
         );
     }
 
-    /**
-     * @throws FailedToDestroyGitHook
-     */
     public function destroyHook(): void
     {
-        if ($this->hook_id) {
-            $this->sourceControl->provider()->destroyHook($this->site->repository, $this->hook_id);
+        try {
+            if ($this->hook_id) {
+                $this->sourceControl->provider()->destroyHook($this->site->repository, $this->hook_id);
+            }
+        } catch (FailedToDestroyGitHook $e) {
+            Log::warning('Failed to destroy git hook', ['error' => $e->getMessage()]);
+        } finally {
+            $this->delete();
         }
-        $this->delete();
     }
 }
diff --git a/app/Models/Site.php b/app/Models/Site.php
index 6942f6d3f..816de8641 100755
--- a/app/Models/Site.php
+++ b/app/Models/Site.php
@@ -5,7 +5,6 @@
 use App\Enums\RedirectStatus;
 use App\Enums\SiteStatus;
 use App\Enums\SslStatus;
-use App\Exceptions\FailedToDestroyGitHook;
 use App\Exceptions\SourceControlIsNotConnected;
 use App\Exceptions\SSHError;
 use App\Services\PHP\PHP;
@@ -112,11 +111,7 @@ public static function boot(): void
             $site->ssls()->delete();
             $site->deployments()->delete();
             $site->deploymentScript()->delete();
-            try {
-                $site->gitHook?->destroyHook();
-            } catch (FailedToDestroyGitHook) {
-                $site->refresh()->gitHook?->delete();
-            }
+            $site->gitHook?->destroyHook();
         });
 
         static::created(function (Site $site): void {
@@ -386,7 +381,6 @@ public function enableAutoDeployment(): void
 
     /**
      * @throws SourceControlIsNotConnected
-     * @throws FailedToDestroyGitHook
      */
     public function disableAutoDeployment(): void
     {
diff --git a/resources/js/pages/databases/index.tsx b/resources/js/pages/databases/index.tsx
index 188d51714..15329439d 100644
--- a/resources/js/pages/databases/index.tsx
+++ b/resources/js/pages/databases/index.tsx
@@ -40,7 +40,7 @@ export default function Databases() {
               </Button>
             </a>
             <SyncDatabases server={page.props.server} />
-            <CreateDatabase server={page.props.server.id}  defaultCharset={defaultCharset} defaultCollation={defaultCollation}>
+            <CreateDatabase server={page.props.server.id} defaultCharset={defaultCharset} defaultCollation={defaultCollation}>
               <Button>
                 <PlusIcon />
                 <span className="hidden lg:block">Create</span>
diff --git a/resources/js/pages/sites/components/create-site.tsx b/resources/js/pages/sites/components/create-site.tsx
index c8a97d4c7..cfd26df1b 100644
--- a/resources/js/pages/sites/components/create-site.tsx
+++ b/resources/js/pages/sites/components/create-site.tsx
@@ -305,8 +305,8 @@ export default function CreateSite({
                           <DialogTitle>Why Isolated Users?</DialogTitle>
                           <DialogDescription>
                             Isolated users are mandatory to ensure security for your sites. If a site has security vulnerabilities and gets
-                            compromised, the attacker cannot take full control of the server because the site runs under its own isolated user
-                            with limited permissions.
+                            compromised, the attacker cannot take full control of the server because the site runs under its own isolated user with
+                            limited permissions.
                           </DialogDescription>
                         </DialogHeader>
                       </DialogContent>
diff --git a/tests/Feature/ApplicationTest.php b/tests/Feature/ApplicationTest.php
index e3e5f1cba..b7519dd9f 100644
--- a/tests/Feature/ApplicationTest.php
+++ b/tests/Feature/ApplicationTest.php
@@ -293,6 +293,32 @@ public function test_disable_auto_deployment(): void
         $this->assertFalse($this->site->isAutoDeployment());
     }
 
+    public function test_disable_auto_deployment_even_if_hook_destroy_fails(): void
+    {
+        Http::fake([
+            'api.github.com/repos/organization/repository' => Http::response([
+                'id' => '123',
+            ], 200),
+            'api.github.com/repos/organization/repository/hooks/*' => Http::response([], 404),
+        ]);
+
+        $this->actingAs($this->user);
+
+        GitHook::factory()->create([
+            'site_id' => $this->site->id,
+            'source_control_id' => $this->site->source_control_id,
+        ]);
+
+        $this->post(route('application.disable-auto-deployment', [
+            'server' => $this->server,
+            'site' => $this->site,
+        ]))->assertSessionDoesntHaveErrors();
+
+        $this->site->refresh();
+
+        $this->assertFalse($this->site->isAutoDeployment());
+    }
+
     public function test_update_env_file(): void
     {
         SSH::fake();