From c25be01af6881f13928a1ab64bc900eaa173464b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 5 Dec 2024 11:00:57 +0100 Subject: [PATCH] fix --- app/Livewire/Source/Github/Change.php | 6 +++++- database/seeders/GithubAppSeeder.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php index 51c5ae3e9..467927484 100644 --- a/app/Livewire/Source/Github/Change.php +++ b/app/Livewire/Source/Github/Change.php @@ -158,6 +158,10 @@ class Change extends Component public function getGithubAppNameUpdatePath() { + if (str($this->github_app->organization)->isNotEmpty()) { + return "{$this->github_app->html_url}/organizations/{$this->github_app->organization}/settings/apps/{$this->github_app->name}"; + } + return "{$this->github_app->html_url}/settings/apps/{$this->github_app->name}"; } @@ -184,7 +188,7 @@ class Change extends Component public function updateGithubAppName() { try { - $privateKey = PrivateKey::find($this->github_app->private_key_id); + $privateKey = PrivateKey::ownedByCurrentTeam()->find($this->github_app->private_key_id); if (! $privateKey) { $this->dispatch('error', 'No private key found for this GitHub App.'); diff --git a/database/seeders/GithubAppSeeder.php b/database/seeders/GithubAppSeeder.php index 2ece7a05b..3cfb82e64 100644 --- a/database/seeders/GithubAppSeeder.php +++ b/database/seeders/GithubAppSeeder.php @@ -23,6 +23,7 @@ class GithubAppSeeder extends Seeder GithubApp::create([ 'name' => 'coolify-laravel-development-public', 'uuid' => '69420', + 'organization' => 'coollabsio', 'api_url' => 'https://api.github.com', 'html_url' => 'https://github.com', 'is_public' => false,