Merge pull request coollabsio#2821 from coollabsio/next

v4.0.0-beta.313

Author: andrasbacsai

app/Exceptions/Handler.php

@@ -65,7 +65,7 @@ public function register(): void
             if ($e instanceof RuntimeException) {
                 return;
             }
-            $this->settings = view()->shared('instanceSettings');
+            $this->settings = \App\Models\InstanceSettings::get();
             if ($this->settings->do_not_track) {
                 return;
             }

app/Http/Controllers/Api/OtherController.php

@@ -84,7 +84,7 @@ public function enable_api(Request $request)
         if ($teamId !== '0') {
             return response()->json(['message' => 'You are not allowed to enable the API.'], 403);
         }
-        $settings = view()->shared('instanceSettings');
+        $settings = \App\Models\InstanceSettings::get();
         $settings->update(['is_api_enabled' => true]);
 
         return response()->json(['message' => 'API enabled.'], 200);
@@ -135,7 +135,7 @@ public function disable_api(Request $request)
         if ($teamId !== '0') {
             return response()->json(['message' => 'You are not allowed to disable the API.'], 403);
         }
-        $settings = view()->shared('instanceSettings');
+        $settings = \App\Models\InstanceSettings::get();
         $settings->update(['is_api_enabled' => false]);
 
         return response()->json(['message' => 'API disabled.'], 200);

app/Http/Controllers/Api/ServersController.php

@@ -300,7 +300,7 @@ public function domains_by_server(Request $request)
         $projects = Project::where('team_id', $teamId)->get();
         $domains = collect();
         $applications = $projects->pluck('applications')->flatten();
-        $settings = view()->shared('instanceSettings');
+        $settings = \App\Models\InstanceSettings::get();
         if ($applications->count() > 0) {
             foreach ($applications as $application) {
                 $ip = $application->destination->server->ip;

app/Http/Middleware/ApiAllowed.php

@@ -14,7 +14,7 @@ public function handle(Request $request, Closure $next): Response
         if (isCloud()) {
             return $next($request);
         }
-        $settings = view()->shared('instanceSettings');
+        $settings = \App\Models\InstanceSettings::get();
         if ($settings->is_api_enabled === false) {
             return response()->json(['success' => true, 'message' => 'API is disabled.'], 403);
         }

app/Jobs/PullCoolifyImageJob.php

@@ -35,7 +35,7 @@ public function handle(): void
             $latest_version = get_latest_version_of_coolify();
             instant_remote_process(["docker pull -q ghcr.io/coollabsio/coolify:{$latest_version}"], $server, false);
 
-            $settings = view()->shared('instanceSettings');
+            $settings = \App\Models\InstanceSettings::get();
             $current_version = config('version');
             if (! $settings->is_auto_update_enabled) {
                 return;

app/Livewire/Help.php

@@ -47,7 +47,7 @@ public function submit()
                 ]
             );
             $mail->subject("[HELP]: {$this->subject}");
-            $settings = view()->shared('instanceSettings');
+            $settings = \App\Models\InstanceSettings::get();
             $type = set_transanctional_email_settings($settings);
             if (! $type) {
                 $url = 'https://app.coolify.io/api/feedback';

app/Livewire/Notifications/Email.php

@@ -172,7 +172,7 @@ public function submitResend()
 
     public function copyFromInstanceSettings()
     {
-        $settings = view()->shared('instanceSettings');
+        $settings = \App\Models\InstanceSettings::get();
         if ($settings->smtp_enabled) {
             $team = currentTeam();
             $team->update([

app/Livewire/Settings/Index.php

@@ -18,7 +18,7 @@ class Index extends Component
     public function mount()
     {
         if (isInstanceAdmin()) {
-            $settings = view()->shared('instanceSettings');
+            $settings = \App\Models\InstanceSettings::get();
             $database = StandalonePostgresql::whereName('coolify-db')->first();
             $s3s = S3Storage::whereTeamId(0)->get() ?? [];
             if ($database) {

app/Livewire/Settings/License.php

@@ -29,7 +29,7 @@ public function mount()
             abort(404);
         }
         $this->instance_id = config('app.id');
-        $this->settings = view()->shared('instanceSettings');
+        $this->settings = \App\Models\InstanceSettings::get();
     }
 
     public function render()

app/Livewire/Source/Github/Change.php

@@ -99,7 +99,7 @@ public function mount()
             return redirect()->route('source.all');
         }
         $this->applications = $this->github_app->applications;
-        $settings = view()->shared('instanceSettings');
+        $settings = \App\Models\InstanceSettings::get();
         $this->github_app->makeVisible('client_secret')->makeVisible('webhook_secret');
 
         $this->name = str($this->github_app->name)->kebab();