From d28cf0b76d2e1177bed65e3e7f4d6170878c332e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 28 Aug 2023 21:03:07 +0200
Subject: [PATCH] fix: webhook endpoint in cloud and no system wide gh app

---
 app/Http/Livewire/Source/Github/Change.php    |  8 +++-
 .../livewire/source/github/change.blade.php   | 38 ++++++++++---------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/app/Http/Livewire/Source/Github/Change.php b/app/Http/Livewire/Source/Github/Change.php
index e2be4e0ab..859e94f79 100644
--- a/app/Http/Livewire/Source/Github/Change.php
+++ b/app/Http/Livewire/Source/Github/Change.php
@@ -37,9 +37,13 @@ class Change extends Component
 
     public function mount()
     {
-        $this->webhook_endpoint = $this->ipv4;
+        if (is_cloud()) {
+            $this->webhook_endpoint = config('app.url');
+        } else {
+            $this->webhook_endpoint = $this->ipv4;
+            $this->is_system_wide = $this->github_app->is_system_wide;
+        }
         $this->parameters = get_route_parameters();
-        $this->is_system_wide = $this->github_app->is_system_wide;
     }
 
     public function submit()
diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index 1fc17d985..737bdac42 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -77,20 +77,22 @@
                 </div>
                 <div class="pt-1 pb-2 ">You need to register a GitHub App before using this source.</div>
                 <div class="pt-2 pb-10">
-                    <div class="flex items-end gap-2">
-                        <x-forms.select wire:model='webhook_endpoint' label="Webhook Endpoint"
-                            helper="All Git webhooks will be sent to this endpoint. <br><br>If you would like to use domain instead of IP address, set your Coolify instance's FQDN in the Settings menu.">
-                            @if ($ipv4)
-                                <option value="{{ $ipv4 }}">Use {{ $ipv4 }}</option>
-                            @endif
-                            @if ($ipv6)
-                                <option value="{{ $ipv6 }}">Use {{ $ipv6 }}</option>
-                            @endif
-                            @if ($fqdn)
-                                <option value="{{ $fqdn }}">Use {{ $fqdn }}</option>
-                            @endif
-                        </x-forms.select>
-                    </div>
+                    @if (!is_cloud())
+                        <div class="flex items-end gap-2">
+                            <x-forms.select wire:model='webhook_endpoint' label="Webhook Endpoint"
+                                helper="All Git webhooks will be sent to this endpoint. <br><br>If you would like to use domain instead of IP address, set your Coolify instance's FQDN in the Settings menu.">
+                                @if ($ipv4)
+                                    <option value="{{ $ipv4 }}">Use {{ $ipv4 }}</option>
+                                @endif
+                                @if ($ipv6)
+                                    <option value="{{ $ipv6 }}">Use {{ $ipv6 }}</option>
+                                @endif
+                                @if ($fqdn)
+                                    <option value="{{ $fqdn }}">Use {{ $fqdn }}</option>
+                                @endif
+                            </x-forms.select>
+                        </div>
+                    @endif
                     <div class="flex flex-col gap-2 pt-4">
                         <x-forms.checkbox disabled instantSave id="default_permissions" label="Default Permissions"
                             helper="Contents: read<br>Metadata: read<br>Email: read" />
@@ -118,9 +120,11 @@
                     <x-forms.input type="number" id="github_app.custom_port" label="Port" required />
                 @endif
             </div>
-            <x-forms.checkbox
-                helper="If checked, this GitHub App will be available for everyone in this Coolify instance."
-                label="System Wide?" disabled id="is_system_wide" />
+            @if (!is_cloud())
+                <x-forms.checkbox
+                    helper="If checked, this GitHub App will be available for everyone in this Coolify instance."
+                    label="System Wide?" disabled id="is_system_wide" />
+            @endif
             <script>
                 function createGithubApp(webhook_endpoint, preview_deployment_permissions) {
                     const {