Remove Service

pelican-dev · Nov 1, 2024 · a627892 · a627892
1 parent f44eb21
commit a627892
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 55 deletions.
diff --git a/app/Filament/Pages/Settings.php b/app/Filament/Pages/Settings.php
@@ -4,7 +4,6 @@
 
 use App\Models\Backup;
 use App\Notifications\MailTested;
-use App\Services\Helpers\TrustedProxyService;
 use App\Traits\EnvironmentWriterTrait;
 use Exception;
 use Filament\Actions\Action;
@@ -25,6 +24,8 @@
 use Filament\Pages\Concerns\HasUnsavedDataChangesAlert;
 use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Notification as MailNotification;
 
@@ -160,7 +161,26 @@ private function generalSettings(): array
                         ->label('Set to Cloudflare IPs')
                         ->icon('tabler-brand-cloudflare')
                         ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(fn (Set $set, TrustedProxyService $service) => $set('TRUSTED_PROXIES', $service->handle())),
+                        ->action(function (Client $client, Set $set) {
+                            $ips = collect();
+                            try {
+                                $response = $client->request(
+                                    'GET',
+                                    'https://api.cloudflare.com/client/v4/ips',
+                                    config('panel.guzzle')
+                                );
+                                if ($response->getStatusCode() === 200) {
+                                    $result = json_decode($response->getBody(), true)['result'];
+                                    foreach (['ipv4_cidrs', 'ipv6_cidrs'] as $value) {
+                                        $ips->push(...data_get($result, $value));
+                                    }
+                                    $ips->unique();
+                                }
+                            } catch (GuzzleException $e) {
+                            }
+
+                            $set('TRUSTED_PROXIES', $ips->values()->all());
+                        }),
                 ]),
         ];
     }

diff --git a/app/Services/Helpers/TrustedProxyService.php b/app/Services/Helpers/TrustedProxyService.php
diff --git a/config/trustedproxy.php b/config/trustedproxy.php
@@ -25,15 +25,4 @@
      */
     'proxies' => in_array(env('TRUSTED_PROXIES', []), ['*', '**']) ?
         env('TRUSTED_PROXIES') : explode(',', env('TRUSTED_PROXIES') ?? ''),
-
-    /*
-    * Automatically pull ips from url
-    */
-    'auto' => [
-        'url' => 'https://api.cloudflare.com/client/v4/ips',
-        'keys' => [
-            'result.ipv4_cidrs',
-            'result.ipv6_cidrs',
-        ],
-    ],
 ];