chore: use new functions

coollabsio · Jan 6, 2025 · 3d98f09 · 3d98f09
1 parent 02774b1
commit 3d98f09
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/app/Jobs/GithubAppPermissionJob.php b/app/Jobs/GithubAppPermissionJob.php
@@ -27,7 +27,7 @@ public function __construct(public GithubApp $github_app) {}
     public function handle()
     {
         try {
-            $github_access_token = generate_github_jwt_token($this->github_app);
+            $github_access_token = generateGithubJwt($this->github_app);
             $response = Http::withHeaders([
                 'Authorization' => "Bearer $github_access_token",
                 'Accept' => 'application/vnd.github+json',

diff --git a/app/Livewire/Project/New/GithubPrivateRepository.php b/app/Livewire/Project/New/GithubPrivateRepository.php
@@ -105,7 +105,7 @@ public function loadRepositories($github_app_id)
         $this->page = 1;
         $this->selected_github_app_id = $github_app_id;
         $this->github_app = GithubApp::where('id', $github_app_id)->first();
-        $this->token = generate_github_installation_token($this->github_app);
+        $this->token = generateGithubInstallationToken($this->github_app);
         $this->loadRepositoryByPage();
         if ($this->repositories->count() < $this->total_repositories_count) {
             while ($this->repositories->count() < $this->total_repositories_count) {

diff --git a/app/Livewire/Source/Github/Change.php b/app/Livewire/Source/Github/Change.php
@@ -76,7 +76,7 @@ public function checkPermissions()
     // Need administration:read:write permission
     // https://docs.github.com/en/rest/actions/self-hosted-runners?apiVersion=2022-11-28#list-self-hosted-runners-for-a-repository
 
-    //     $github_access_token = generate_github_installation_token($this->github_app);
+    //     $github_access_token = generateGithubInstallationToken($this->github_app);
     //     $repositories = Http::withToken($github_access_token)->get("{$this->github_app->api_url}/installation/repositories?per_page=100");
     //     $runners_by_repository = collect([]);
     //     $repositories = $repositories->json()['repositories'];

diff --git a/app/Models/Application.php b/app/Models/Application.php
@@ -999,7 +999,7 @@ public function generateGitLsRemoteCommands(string $deployment_uuid, bool $exec_
                     $fullRepoUrl = "{$this->source->html_url}/{$customRepository}";
                     $base_command = "{$base_command} {$this->source->html_url}/{$customRepository}";
                 } else {
-                    $github_access_token = generate_github_installation_token($this->source);
+                    $github_access_token = generateGithubInstallationToken($this->source);
 
                     if ($exec_in_docker) {
                         $base_command = "{$base_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git";
@@ -1111,7 +1111,7 @@ public function generateGitImportCommands(string $deployment_uuid, int $pull_req
                         $commands->push($git_clone_command);
                     }
                 } else {
-                    $github_access_token = generate_github_installation_token($this->source);
+                    $github_access_token = generateGithubInstallationToken($this->source);
                     if ($exec_in_docker) {
                         $git_clone_command = "{$git_clone_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git {$baseDir}";
                         $fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git";

diff --git a/resources/views/livewire/project/application/source.blade.php b/resources/views/livewire/project/application/source.blade.php
@@ -10,7 +10,7 @@
                 </x-forms.button>
             </a>
             @if (data_get($application, 'source.is_public') === false)
-                <a target="_blank" class="hover:no-underline" href="{{ get_installation_path($application->source) }}">
+                <a target="_blank" class="hover:no-underline" href="{{ getInstallationPath($application->source) }}">
                     <x-forms.button>
                         Open Git App
                         <x-external-link />

diff --git a/resources/views/livewire/project/new/github-private-repository.blade.php b/resources/views/livewire/project/new/github-private-repository.blade.php
@@ -5,7 +5,7 @@
             <livewire:source.github.create />
         </x-modal-input>
         @if ($repositories->count() > 0)
-            <a target="_blank" class="flex hover:no-underline" href="{{ get_installation_path($github_app) }}">
+            <a target="_blank" class="flex hover:no-underline" href="{{ getInstallationPath($github_app) }}">
                 <x-forms.button>
                     Change Repositories on GitHub
                     <x-external-link />

diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
@@ -6,7 +6,7 @@
                 <div class="flex gap-2">
                     @if (data_get($github_app, 'installation_id'))
                         <x-forms.button type="submit">Save</x-forms.button>
-                        <a href="{{ get_installation_path($github_app) }}">
+                        <a href="{{ getInstallationPath($github_app) }}">
                             <x-forms.button>
                                 Update Repositories
                                 <x-external-link />
@@ -52,7 +52,7 @@
                     </svg>
                     <span>You must complete this step before you can use this source!</span>
                 </div>
-                <a class="items-center justify-center box" href="{{ get_installation_path($github_app) }}">
+                <a class="items-center justify-center box" href="{{ getInstallationPath($github_app) }}">
                     Install Repositories on GitHub
                 </a>
             @else
@@ -106,7 +106,7 @@
                     <div class="flex items-end gap-2 ">
                         <h2 class="pt-4">Permissions</h2>
                         <x-forms.button wire:click.prevent="checkPermissions">Refetch</x-forms.button>
-                        <a href="{{ get_permissions_path($github_app) }}">
+                        <a href="{{ getPermissionsPath($github_app) }}">
                             <x-forms.button>
                                 Update
                                 <x-external-link />