From e4b21959325f6fd607a07e699ad7e3d9b5e4cce6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 14 Nov 2023 14:14:21 +0100
Subject: [PATCH] Fix manual Git webhook generation

---
 bootstrap/helpers/shared.php                  |  3 ++
 .../project/shared/webhooks.blade.php         | 46 ++++++++++---------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 1abb90ce5..a11e857ce 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -511,6 +511,9 @@ function generateDeployWebhook($resource)
     return $url;
 }
 function generateGitManualWebhook($resource, $type) {
+    if ($resource->source_id !== 0) {
+        return null;
+    }
     if ($resource->getMorphClass() === 'App\Models\Application') {
         $baseUrl = base_url();
         $api = Url::fromString($baseUrl) . "/webhooks/source/$type/events/manual";
diff --git a/resources/views/livewire/project/shared/webhooks.blade.php b/resources/views/livewire/project/shared/webhooks.blade.php
index 243b5dea3..c77ae3315 100644
--- a/resources/views/livewire/project/shared/webhooks.blade.php
+++ b/resources/views/livewire/project/shared/webhooks.blade.php
@@ -11,27 +11,31 @@
     </div>
     <div>
         <h3>Manual Git Webhooks</h3>
-        <form wire:submit.prevent='saveSecret' class="flex flex-col gap-2">
-            <div class="flex items-end gap-2">
-                <x-forms.input helper="Content Type in GitHub configuration could be json or form-urlencoded." readonly
-                    label="GitHub" id="githubManualWebhook"></x-forms.input>
-                <x-forms.input type="password"
-                    helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitHub."
-                    label="GitHub Webhook Secret" id="resource.manual_webhook_secret_github"></x-forms.input>
+        @if ($githubManualWebhook && $gitlabManualWebhook)
+            <form wire:submit.prevent='saveSecret' class="flex flex-col gap-2">
+                <div class="flex items-end gap-2">
+                    <x-forms.input helper="Content Type in GitHub configuration could be json or form-urlencoded."
+                        readonly label="GitHub" id="githubManualWebhook"></x-forms.input>
+                    <x-forms.input type="password"
+                        helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitHub."
+                        label="GitHub Webhook Secret" id="resource.manual_webhook_secret_github"></x-forms.input>
 
-            </div>
-            <a target="_blank" class="flex hover:no-underline" href="{{ $resource?->gitWebhook }}">
-                <x-forms.button>Webhook Configuration on GitHub
-                    <x-external-link />
-                </x-forms.button>
-            </a>
-            <div class="flex gap-2">
-                <x-forms.input readonly label="GitLab" id="gitlabManualWebhook"></x-forms.input>
-                <x-forms.input type="password"
-                    helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitLab."
-                    label="GitLab Webhook Secret" id="resource.manual_webhook_secret_gitlab"></x-forms.input>
-            </div>
-            <x-forms.button type="submit">Save</x-forms.button>
-        </form>
+                </div>
+                <a target="_blank" class="flex hover:no-underline" href="{{ $resource?->gitWebhook }}">
+                    <x-forms.button>Webhook Configuration on GitHub
+                        <x-external-link />
+                    </x-forms.button>
+                </a>
+                <div class="flex gap-2">
+                    <x-forms.input readonly label="GitLab" id="gitlabManualWebhook"></x-forms.input>
+                    <x-forms.input type="password"
+                        helper="Need to set a secret to be able to use this webhook. It should match with the secret in GitLab."
+                        label="GitLab Webhook Secret" id="resource.manual_webhook_secret_gitlab"></x-forms.input>
+                </div>
+                <x-forms.button type="submit">Save</x-forms.button>
+            </form>
+        @else
+            You are using an official Git App. You do not need manual webhooks.
+        @endif
     </div>
 </div>