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(user): use $this instead of Auth::user() in User model methods
Andras Bacsai2cf915aed813
diff --git a/app/Http/Middleware/DecideWhatToDoWithUser.php b/app/Http/Middleware/DecideWhatToDoWithUser.phpindex 64952533f8..b62e874cc8 100644--- a/app/Http/Middleware/DecideWhatToDoWithUser.php+++ b/app/Http/Middleware/DecideWhatToDoWithUser.php@@ -27,7 +27,7 @@ class DecideWhatToDoWithUserreturn $next($request);}// Instance admins can access settings and admin routes regardless of subscription- if (isInstanceAdmin() && (Str::startsWith($request->path(), 'settings') || $request->path() === 'admin')) {+ if (isInstanceAdmin() && ($request->routeIs('settings.*') || $request->routeIs('settings.index') || $request->path() === 'admin')) {return $next($request);}if (! auth()->user()->hasVerifiedEmail()) {diff --git a/app/Models/User.php b/app/Models/User.phpindex bbc4e603c6..0b0666c1ae 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -295,7 +295,7 @@ class User extends Authenticatable implements SendsEmailpublic function isInstanceAdmin(){- $found_root_team = Auth::user()->teams->filter(function ($team) {+ $found_root_team = $this->teams->filter(function ($team) {if ($team->id == 0) {$role = $team->pivot->role;if ($role !== 'admin' && $role !== 'owner') {@@ -313,9 +313,9 @@ class User extends Authenticatable implements SendsEmailpublic function currentTeam(){- return Cache::remember('team:'.Auth::id(), 3600, function () {- if (is_null(data_get(session('currentTeam'), 'id')) && Auth::user()->teams->count() > 0) {- return Auth::user()->teams[0];+ return Cache::remember('team:'.$this->id, 3600, function () {+ if (is_null(data_get(session('currentTeam'), 'id')) && $this->teams->count() > 0) {+ return $this->teams[0];}return Team::find(session('currentTeam')->id);@@ -324,7 +324,7 @@ class User extends Authenticatable implements SendsEmailpublic function otherTeams(){- return Auth::user()->teams->filter(function ($team) {+ return $this->teams->filter(function ($team) {return $team->id != currentTeam()->id;});}@@ -334,9 +334,9 @@ class User extends Authenticatable implements SendsEmailif (data_get($this, 'pivot')) {return $this->pivot->role;}- $user = Auth::user()->teams->where('id', currentTeam()->id)->first();+ $team = $this->teams->where('id', currentTeam()->id)->first();- return data_get($user, 'pivot.role');+ return data_get($team, 'pivot.role');}/**