fix(github): preserve custom app API URLs

app/Http/Controllers/Api/GithubController.php

@@ -256,7 +256,9 @@ class GithubController extends Controller
                 'uuid' => Str::uuid(),
                 'name' => $request->input('name'),
                 'organization' => $request->input('organization'),
-                'api_url' => githubApiUrlFromHtmlUrl($request->input('html_url')),
+                'api_url' => filled($request->input('api_url'))
+                    ? $request->input('api_url')
+                    : githubApiUrlFromHtmlUrl($request->input('html_url')),
                 'html_url' => $request->input('html_url'),
                 'custom_user' => $request->input('custom_user', 'git'),
                 'custom_port' => $request->input('custom_port', 22),
@@ -650,7 +652,7 @@ class GithubController extends Controller
             if (array_key_exists('organization', $payload)) {
                 $payload['organization'] = normalizeGithubOrganization($payload['organization']);
             }
-            if (isset($payload['html_url'])) {
+            if (isset($payload['html_url']) && ! filled($payload['api_url'] ?? null)) {
                 $payload['api_url'] = githubApiUrlFromHtmlUrl($payload['html_url']);
             }
 

app/Livewire/Source/Github/Change.php

@@ -79,6 +79,8 @@ class Change extends Component
 
     public string $activeTab = 'general';
 
+    private bool $shouldDeriveApiUrlAfterHtmlUrlUpdate = false;
+
     protected function rules(): array
     {
         return [
@@ -104,9 +106,17 @@ class Change extends Component
         ];
     }
 
+    public function updatingHtmlUrl(): void
+    {
+        $this->shouldDeriveApiUrlAfterHtmlUrlUpdate = blank($this->apiUrl)
+            || $this->apiUrl === githubApiUrlFromHtmlUrl($this->htmlUrl);
+    }
+
     public function updatedHtmlUrl(): void
     {
-        $this->apiUrl = githubApiUrlFromHtmlUrl($this->htmlUrl);
+        if ($this->shouldDeriveApiUrlAfterHtmlUrlUpdate) {
+            $this->apiUrl = githubApiUrlFromHtmlUrl($this->htmlUrl);
+        }
     }
 
     public function boot()
@@ -126,7 +136,9 @@ class Change extends Component
         if ($toModel) {
             // Sync TO model (before save)
             $this->organization = normalizeGithubOrganization($this->organization);
-            $this->apiUrl = githubApiUrlFromHtmlUrl($this->htmlUrl);
+            $this->apiUrl = filled($this->apiUrl)
+                ? $this->apiUrl
+                : githubApiUrlFromHtmlUrl($this->htmlUrl);
 
             $this->github_app->name = $this->name;
             $this->github_app->organization = $this->organization;
@@ -354,7 +366,9 @@ class Change extends Component
 
             $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
             $this->organization = normalizeGithubOrganization($this->organization);
-            $this->apiUrl = githubApiUrlFromHtmlUrl($this->htmlUrl);
+            $this->apiUrl = filled($this->apiUrl)
+                ? $this->apiUrl
+                : githubApiUrlFromHtmlUrl($this->htmlUrl);
             $this->validate();
 
             $this->syncData(true);

app/Livewire/Source/Github/Create.php

@@ -5,6 +5,7 @@ namespace App\Livewire\Source\Github;
 use App\Models\GithubApp;
 use App\Rules\SafeExternalUrl;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Validation\ValidationException;
 use Livewire\Component;
 
 class Create extends Component
@@ -25,14 +26,24 @@ class Create extends Component
 
     public bool $is_system_wide = false;
 
+    private bool $shouldDeriveApiUrlAfterHtmlUrlUpdate = false;
+
     public function mount()
     {
         $this->name = substr(generate_random_name(), 0, 30);
     }
 
+    public function updatingHtmlUrl(): void
+    {
+        $this->shouldDeriveApiUrlAfterHtmlUrlUpdate = blank($this->api_url)
+            || $this->api_url === githubApiUrlFromHtmlUrl($this->html_url);
+    }
+
     public function updatedHtmlUrl(): void
     {
-        $this->api_url = githubApiUrlFromHtmlUrl($this->html_url);
+        if ($this->shouldDeriveApiUrlAfterHtmlUrlUpdate) {
+            $this->api_url = githubApiUrlFromHtmlUrl($this->html_url);
+        }
     }
 
     public function createGitHubApp()
@@ -41,7 +52,9 @@ class Create extends Component
             $this->authorize('createAnyResource');
 
             $this->organization = normalizeGithubOrganization($this->organization);
-            $this->api_url = githubApiUrlFromHtmlUrl($this->html_url);
+            $this->api_url = filled($this->api_url)
+                ? $this->api_url
+                : githubApiUrlFromHtmlUrl($this->html_url);
 
             $this->validate([
                 'name' => 'required|string',
@@ -68,6 +81,8 @@ class Create extends Component
             }
 
             return redirectRoute($this, 'source.github.show', ['github_app_uuid' => $github_app->uuid]);
+        } catch (ValidationException $e) {
+            throw $e;
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }