tiennm99/coolify
1
0
Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-04-17 15:20:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(settings): fix 404 on /settings for root user on cloud (#7785)

Browse Source
This commit is contained in:
Andras Bacsai
2026-01-02 13:18:07 +01:00
committed by GitHub
parent b448b08058 b33962bf82
commit 009b4e7d48
11 changed files with 97 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bootstrap/helpers/shared.php
View File

@@ -182,8 +182,11 @@ function refreshSession(?Team $team = null): void
$team = User::find(Auth::id())->teams->first();
}
}
// Clear old cache key format for backwards compatibility
Cache::forget('team:'.Auth::id());
Cache::remember('team:'.Auth::id(), 3600, function () use ($team) {
// Use new cache key format that includes team ID
Cache::forget('user:'.Auth::id().':team:'.$team->id);
Cache::remember('user:'.Auth::id().':team:'.$team->id, 3600, function () use ($team) {
return $team;
});
session(['currentTeam' => $team]);
@@ -384,7 +387,7 @@ function base_url(bool $withPort = true): string
function isSubscribed()
{
return isSubscriptionActive() || auth()->user()->isInstanceAdmin();
return isSubscriptionActive();
}
function isProduction(): bool

4
bootstrap/helpers/subscriptions.php
View File

@@ -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)) {