Code improvements

This commit is contained in:
2026-09-04 09:27:48 +02:00
parent d23e6c3914
commit 4bb64b0053
51 changed files with 30702 additions and 87 deletions
+6 -6
View File
@@ -7,12 +7,12 @@ use App\Models\User;
class AuthCheckProvider {
public function checkLoggedIn() : bool {
if (!auth()->check()) {
$user = currentUser();
if ($user === null) {
return false;
}
$user = auth()->user();
$tenant = app('tenant');
$tenant = currentTenant();
if ($tenant->slug === 'lv') {
return $user->active;
}
@@ -29,9 +29,9 @@ class AuthCheckProvider {
return null;
}
$user = auth()->user();
$user = currentUserOrFail();
if (app('tenant')->slug === 'lv') {
if (currentTenant()->slug === 'lv') {
return $user->user_role_main;
}
@@ -50,7 +50,7 @@ class AuthCheckProvider {
* Diese Rolle hebt das lokale Rechtesystem für alle Sub-Tenants auf.
*/
public function isMainAdministrator(?User $user = null) : bool {
$user ??= auth()->user();
$user ??= currentUser();
return $user !== null
&& $user->user_role_main === UserRole::USER_ROLE_ADMIN;