fix: github source view

app/Http/Livewire/Source/Github/Change.php

@@ -3,17 +3,18 @@
 namespace App\Http\Livewire\Source\Github;
 
 use App\Models\GithubApp;
+use App\Models\InstanceSettings;
 use Livewire\Component;
 
 class Change extends Component
 {
     public string $webhook_endpoint;
-    public string|null $ipv4;
+    public ?string $ipv4;
-    public string|null $ipv6;
+    public ?string $ipv6;
-    public string|null $fqdn;
+    public ?string $fqdn;
 
-    public bool|null $default_permissions = true;
+    public ?bool $default_permissions = true;
-    public bool|null $preview_deployment_permissions = true;
+    public ?bool $preview_deployment_permissions = true;
 
     public $parameters;
     public GithubApp $github_app;
@@ -28,29 +29,68 @@ class Change extends Component
         'github_app.custom_user' => 'required|string',
         'github_app.custom_port' => 'required|int',
         'github_app.app_id' => 'required|int',
-        'github_app.installation_id' => 'nullable',
+        'github_app.installation_id' => 'required|int',
-        'github_app.client_id' => 'nullable',
+        'github_app.client_id' => 'required|string',
-        'github_app.client_secret' => 'nullable',
+        'github_app.client_secret' => 'required|string',
-        'github_app.webhook_secret' => 'nullable',
+        'github_app.webhook_secret' => 'required|string',
         'github_app.is_system_wide' => 'required|bool',
     ];
 
     public function mount()
     {
+        $github_app_uuid = request()->github_app_uuid;
+        $this->github_app = GithubApp::where('uuid', $github_app_uuid)->first();
+        if (!$this->github_app) {
+            return redirect()->route('source.all');
+        }
+        $settings = InstanceSettings::get();
+        $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
+
+        $this->name = str($this->github_app->name)->kebab();
+        $this->fqdn = $settings->fqdn;
+
+        if ($settings->public_ipv4) {
+            $this->ipv4 = 'http://' . $settings->public_ipv4 . ':' . config('app.port');
+        }
+        if ($settings->public_ipv6) {
+            $this->ipv6 = 'http://' . $settings->public_ipv6 . ':' . config('app.port');
+        }
+        if ($this->github_app->installation_id && session('from')) {
+            $source_id = data_get(session('from'), 'source_id');
+            if (!$source_id || $this->github_app->id !== $source_id) {
+                session()->forget('from');
+            } else {
+                $parameters = data_get(session('from'), 'parameters');
+                $back = data_get(session('from'), 'back');
+                $environment_name = data_get($parameters, 'environment_name');
+                $project_uuid = data_get($parameters, 'project_uuid');
+                $type = data_get($parameters, 'type');
+                $destination = data_get($parameters, 'destination');
+                session()->forget('from');
+                return redirect()->route($back, [
+                    'environment_name' => $environment_name,
+                    'project_uuid' => $project_uuid,
+                    'type' => $type,
+                    'destination' => $destination,
+                ]);
+            }
+        }
+        $this->parameters = get_route_parameters();
         if (isCloud() && !isDev()) {
             $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();
     }
 
     public function submit()
     {
         try {
+            $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
             $this->validate();
             $this->github_app->save();
+            $this->emit('success', 'Github App updated successfully.');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.111',
+    'release' => '4.0.0-beta.112',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.111';
+return '4.0.0-beta.112';

resources/views/livewire/source/github/change.blade.php

@@ -4,32 +4,26 @@
             <p>This source will be deleted. It is not reversible. <br>Please think again.</p>
         </x-slot:modalBody>
     </x-modal>
-    <form wire:submit.prevent='submit' x-data>
+    @if (data_get($github_app, 'app_id'))
+        <form wire:submit.prevent='submit'>
             <div class="flex items-center gap-2">
                 <h1>GitHub App</h1>
                 <div class="flex gap-2">
-                @if ($github_app->app_id)
-                    <x-forms.button type="submit">Save</x-forms.button>
-
                     @if (data_get($github_app, 'installation_id'))
+                    <x-forms.button type="submit">Save</x-forms.button>
                         <a href="{{ get_installation_path($github_app) }}">
                             <x-forms.button>
-
                                 Update Repositories
                                 <x-external-link />
                             </x-forms.button>
                         </a>
                     @endif
-                @else
-                    <x-forms.button disabled type="submit">Save</x-forms.button>
-                @endif
                     <x-forms.button isError isModal modalId="deleteSource">
                         Delete
                     </x-forms.button>
                 </div>
             </div>
             <div class="subtitle">Your Private GitHub App for private repositories.</div>
-        @if (data_get($github_app, 'app_id'))
             @if (!data_get($github_app, 'installation_id'))
                 <div class="mb-10 rounded alert alert-warning">
                     <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
@@ -39,7 +33,7 @@
                     </svg>
                     <span>You must complete this step before you can use this source!</span>
                 </div>
-                <a class="justify-center box" href="{{ get_installation_path($github_app) }}">
+                <a class="items-center justify-center box" href="{{ get_installation_path($github_app) }}">
                     Install Repositories on GitHub
                 </a>
             @else
@@ -78,7 +72,16 @@
                     <x-forms.input id="github_app.webhook_secret" label="Webhook Secret" type="password" />
                 </div>
             @endif
+        </form>
     @else
+        <div class="flex items-center gap-2 pb-4">
+            <h1>GitHub App</h1>
+            <div class="flex gap-2">
+                <x-forms.button isError isModal modalId="deleteSource">
+                    Delete
+                </x-forms.button>
+            </div>
+        </div>
         <div class="mb-10 rounded alert alert-warning">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
                 viewBox="0 0 24 24">
@@ -87,10 +90,10 @@
             </svg>
             <span>You must complete this step before you can use this source!</span>
         </div>
-            <form class="flex gap-4">
+        <div class="flex flex-col">
-                <h2>Register a GitHub App</h2>
+            <h2 >Register a GitHub App</h2>
-                <div class="pt-1 pb-2 ">You need to register a GitHub App before using this source.</div>
+            <div >You need to register a GitHub App before using this source.</div>
-                <div class="pt-2 pb-10">
+            <div class="py-10">
                 @if (!isCloud() || isDev())
                     <div class="flex items-end gap-2">
                         <x-forms.select wire:model='webhook_endpoint' label="Webhook Endpoint"
@@ -127,7 +130,7 @@
                         helper="Necessary for updating pull requests with useful comments (deployment status, links, etc.)<br><br>Pull Request: read & write" />
                 </div>
             </div>
-            </form>
+        </div>
         <script>
             function createGithubApp(webhook_endpoint, preview_deployment_permissions) {
                 const {
@@ -183,5 +186,4 @@
             }
         </script>
     @endif
-    </form>
 </div>

routes/web.php

@@ -20,11 +20,10 @@ use App\Http\Livewire\Server\PrivateKey\Show as PrivateKeyShow;
 use App\Http\Livewire\Server\Proxy\Show as ProxyShow;
 use App\Http\Livewire\Server\Proxy\Logs as ProxyLogs;
 use App\Http\Livewire\Server\Show;
+use App\Http\Livewire\Source\Github\Change as GitHubChange;
 use App\Http\Livewire\Subscription\Show as SubscriptionShow;
 use App\Http\Livewire\Waitlist\Index as WaitlistIndex;
-use App\Models\GithubApp;
 use App\Models\GitlabApp;
-use App\Models\InstanceSettings;
 use App\Models\PrivateKey;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
@@ -178,49 +177,7 @@ Route::middleware(['auth'])->group(function () {
             'sources' => $sources,
         ]);
     })->name('source.all');
-    Route::get('/source/github/{github_app_uuid}', function (Request $request) {
+    Route::get('/source/github/{github_app_uuid}', GitHubChange::class)->name('source.github.show');
-        $github_app = GithubApp::where('uuid', request()->github_app_uuid)->first();
-        if (!$github_app) {
-            abort(404);
-        }
-        $github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
-        $settings = InstanceSettings::get();
-        $name = Str::of(Str::kebab($github_app->name));
-        if ($settings->public_ipv4) {
-            $ipv4 = 'http://' . $settings->public_ipv4 . ':' . config('app.port');
-        }
-        if ($settings->public_ipv6) {
-            $ipv6 = 'http://' . $settings->public_ipv6 . ':' . config('app.port');
-        }
-        if ($github_app->installation_id && session('from')) {
-            $source_id = data_get(session('from'), 'source_id');
-            if (!$source_id || $github_app->id !== $source_id) {
-                session()->forget('from');
-            } else {
-                $parameters = data_get(session('from'), 'parameters');
-                $back = data_get(session('from'), 'back');
-                $environment_name = data_get($parameters, 'environment_name');
-                $project_uuid = data_get($parameters, 'project_uuid');
-                $type = data_get($parameters, 'type');
-                $destination = data_get($parameters, 'destination');
-                session()->forget('from');
-                return redirect()->route($back, [
-                    'environment_name' => $environment_name,
-                    'project_uuid' => $project_uuid,
-                    'type' => $type,
-                    'destination' => $destination,
-                ]);
-            }
-        }
-        return view('source.github.show', [
-            'github_app' => $github_app,
-            'name' => $name,
-            'ipv4' => $ipv4 ?? null,
-            'ipv6' => $ipv6 ?? null,
-            'fqdn' => $settings->fqdn,
-        ]);
-    })->name('source.github.show');
-
     Route::get('/source/gitlab/{gitlab_app_uuid}', function (Request $request) {
         $gitlab_app = GitlabApp::where('uuid', request()->gitlab_app_uuid)->first();
         return view('source.gitlab.show', [

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.111"
+            "version": "4.0.0-beta.112"
         }
     }
 }