An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(settings): fix 404 on /settings for root user on cloud instance
Andras Bacsaiacff543e09ae
diff --git a/app/Http/Middleware/DecideWhatToDoWithUser.php b/app/Http/Middleware/DecideWhatToDoWithUser.phpindex 8b1c550dfe..64952533f8 100644--- a/app/Http/Middleware/DecideWhatToDoWithUser.php+++ b/app/Http/Middleware/DecideWhatToDoWithUser.php@@ -19,13 +19,17 @@ class DecideWhatToDoWithUserif (auth()?->user()?->currentTeam()) {refreshSession(auth()->user()->currentTeam());}- if (! auth()->user() || ! isCloud() || isInstanceAdmin()) {+ if (! auth()->user() || ! isCloud()) {if (! isCloud() && showBoarding() && ! in_array($request->path(), allowedPathsForBoardingAccounts())) {return redirect()->route('onboarding');}return $next($request);}+ // Instance admins can access settings and admin routes regardless of subscription+ if (isInstanceAdmin() && (Str::startsWith($request->path(), 'settings') || $request->path() === 'admin')) {+ return $next($request);+ }if (! auth()->user()->hasVerifiedEmail()) {if ($request->path() === 'verify' || in_array($request->path(), allowedPathsForInvalidAccounts()) || $request->routeIs('verify.verify')) {return $next($request);diff --git a/app/Livewire/Settings/Advanced.php b/app/Livewire/Settings/Advanced.phpindex fb9c912637..0a7ba319d3 100644--- a/app/Livewire/Settings/Advanced.php+++ b/app/Livewire/Settings/Advanced.php@@ -10,8 +10,7 @@ use Livewire\Component;class Advanced extends Component{- #[Validate('required')]- public Server $server;+ public ?Server $server = null;public InstanceSettings $settings;@@ -44,7 +43,6 @@ class Advanced extends Componentpublic function rules(){return [- 'server' => 'required','is_registration_enabled' => 'boolean','do_not_track' => 'boolean','is_dns_validation_enabled' => 'boolean',@@ -62,7 +60,9 @@ class Advanced extends Componentif (! isInstanceAdmin()) {return redirect()->route('dashboard');}- $this->server = Server::findOrFail(0);+ if (! isCloud()) {+ $this->server = Server::findOrFail(0);+ }$this->settings = instanceSettings();$this->custom_dns_servers = $this->settings->custom_dns_servers;$this->allowed_ips = $this->settings->allowed_ips;diff --git a/app/Livewire/Settings/Index.php b/app/Livewire/Settings/Index.phpindex 7a96eabb26..ae74488072 100644--- a/app/Livewire/Settings/Index.php+++ b/app/Livewire/Settings/Index.php@@ -12,7 +12,7 @@ class Index extends Component{public InstanceSettings $settings;- public Server $server;+ public ?Server $server = null;#[Validate('nullable|string|max:255')]public ?string $fqdn = null;@@ -57,7 +57,9 @@ class Index extends Componentreturn redirect()->route('dashboard');}$this->settings = instanceSettings();- $this->server = Server::findOrFail(0);+ if (! isCloud()) {+ $this->server = Server::findOrFail(0);+ }$this->fqdn = $this->settings->fqdn;$this->public_port_min = $this->settings->public_port_min;$this->public_port_max = $this->settings->public_port_max;@@ -121,7 +123,7 @@ class Index extends Component}$this->validate();- if ($this->settings->is_dns_validation_enabled && $this->fqdn) {+ if ($this->settings->is_dns_validation_enabled && $this->fqdn && $this->server) {if (! validateDNSEntry($this->fqdn, $this->server)) {$this->dispatch('error', "Validating DNS failed.<br><br>Make sure you have added the DNS records correctly.<br><br>{$this->fqdn}->{$this->server->ip}<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");$error_show = true;@@ -145,7 +147,9 @@ class Index extends Component$this->instantSave(isSave: false);$this->settings->save();- $this->server->setupDynamicProxyConfiguration();+ if ($this->server) {+ $this->server->setupDynamicProxyConfiguration();+ }if (! $error_show) {$this->dispatch('success', 'Instance settings updated successfully!');}@@ -163,6 +167,12 @@ class Index extends Componentreturn;}+ if (! $this->server) {+ $this->dispatch('error', 'Server not available.');++ return;+ }+$version = $this->dev_helper_version ?: config('constants.coolify.helper_version');if (empty($version)) {$this->dispatch('error', 'Please specify a version to build.');diff --git a/app/Livewire/Settings/Updates.php b/app/Livewire/Settings/Updates.phpindex fe20763b6a..01a67c38ca 100644--- a/app/Livewire/Settings/Updates.php+++ b/app/Livewire/Settings/Updates.php@@ -12,7 +12,7 @@ class Updates extends Component{public InstanceSettings $settings;- public Server $server;+ public ?Server $server = null;#[Validate('string')]public string $auto_update_frequency;@@ -25,7 +25,9 @@ class Updates extends Componentpublic function mount(){- $this->server = Server::findOrFail(0);+ if (! isCloud()) {+ $this->server = Server::findOrFail(0);+ }$this->settings = instanceSettings();$this->auto_update_frequency = $this->settings->auto_update_frequency;@@ -76,7 +78,9 @@ class Updates extends Component}$this->instantSave();- $this->server->setupDynamicProxyConfiguration();+ if ($this->server) {+ $this->server->setupDynamicProxyConfiguration();+ }} catch (\Exception $e) {return handleError($e, $this);}diff --git a/app/Models/User.php b/app/Models/User.phpindex b790efcf11..bbc4e603c6 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -297,7 +297,8 @@ class User extends Authenticatable implements SendsEmail{$found_root_team = Auth::user()->teams->filter(function ($team) {if ($team->id == 0) {- if (! Auth::user()->isAdmin()) {+ $role = $team->pivot->role;+ if ($role !== 'admin' && $role !== 'owner') {return false;}diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.phpindex 9fc1e6f1ce..f9645fd9f9 100644--- a/bootstrap/helpers/shared.php+++ b/bootstrap/helpers/shared.php@@ -384,7 +384,7 @@ function base_url(bool $withPort = true): stringfunction isSubscribed(){- return isSubscriptionActive() || auth()->user()->isInstanceAdmin();+ return isSubscriptionActive();}function isProduction(): booldiff --git a/bootstrap/helpers/subscriptions.php b/bootstrap/helpers/subscriptions.phpindex 1a0ae0fbd8..4b84fb7f65 100644--- a/bootstrap/helpers/subscriptions.php+++ b/bootstrap/helpers/subscriptions.php@@ -13,6 +13,10 @@ function isSubscriptionActive()if (! $team) {return false;}+ // Root team (id=0) doesn't require subscription+ if ($team->id === 0) {+ return true;+ }$subscription = $team?->subscription;if (is_null($subscription)) {