From 716c9aa8606ed0f6be441b17140813cbf391b2e7 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 19 Jun 2023 09:14:09 +0200
Subject: [PATCH] fixes

---
 config/version.php                                      | 2 +-
 resources/views/components/forms/input.blade.php        | 4 ++--
 resources/views/livewire/source/github/change.blade.php | 2 --
 routes/webhooks.php                                     | 8 +-------
 versions.json                                           | 2 +-
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/config/version.php b/config/version.php
index 3847005bb..b6e6dc283 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-nightly.23';
+return '4.0.0-nightly.24';
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index 647139ad5..33df229fe 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -43,8 +43,8 @@
             <input {{ $attributes }} id={{ $id }} name={{ $name }}
                 wire:model.defer={{ $id }} wire:dirty.class="input-warning" wire:loading.attr='disabled'
                 @readonly($readonly) @disabled($disabled)
-                @isset($value) value={{ $value }} @endisset
-                @isset($placeholder) placeholder={{ $placeholder }} @endisset>
+                @isset($value) value="{{ $value }}" @endisset
+                @isset($placeholder) placeholder="{{ $placeholder }}" @endisset>
         @endif
         @if (!$label && $helper)
             <x-helper :helper="$helper" />
diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index 97bc8a071..c896e9a90 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -88,8 +88,6 @@
                                 <option value="{{ $fqdn }}">Use {{ $fqdn }}</option>
                             @endif
                         </x-forms.select>
-
-
                     </div>
                     <div class="flex flex-col gap-2 pt-4">
                         <x-forms.checkbox disabled instantSave id="default_permissions" label="Default Permissions"
diff --git a/routes/webhooks.php b/routes/webhooks.php
index 803e5190a..62bcc758b 100644
--- a/routes/webhooks.php
+++ b/routes/webhooks.php
@@ -29,6 +29,7 @@ Route::get('/source/github/redirect', function () {
             'private_key' => $private_key,
             'team_id' => $github_app->team_id
         ]);
+        $github_app->name = $slug;
         $github_app->app_id = $id;
         $github_app->client_id = $client_id;
         $github_app->client_secret = $client_secret;
@@ -51,13 +52,6 @@ Route::get('/source/github/install', function () {
             $github_app->installation_id = $installation_id;
             $github_app->save();
         }
-        // Must check the slug in case the user changes it in the GitHub App settings
-        $token = generate_github_jwt_token($github_app);
-        $response = Http::github($github_app->api_url, $token)->get('/app');
-        $slug = data_get($response->json(), 'slug');
-        $github_app->name = $slug;
-        $github_app->save();
-
         return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
     } catch (\Exception $e) {
         return general_error_handler(err: $e);
diff --git a/versions.json b/versions.json
index f4048f147..b1f7e7129 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.32"
         },
         "v4": {
-            "version": "4.0.0-nightly.23"
+            "version": "4.0.0-nightly.24"
         }
     }
 }
\ No newline at end of file