Code improvements

app/Providers/AuthCheckProvider.php

@@ -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;

app/Providers/CronTaskHandleProvider.php

@@ -61,7 +61,7 @@ class CronTaskHandleProvider extends CommonController
 
     private function runTask(CronTask $task)
     {
-        $logger = $this->taskLogger($task->name, app('tenant'));
+        $logger = $this->taskLogger($task->name, currentTenant());
         app()->instance('taskLogger', $logger);
 
         $taskClass = "\\App\\Tasks\\" . $task->name;
@@ -73,7 +73,7 @@ class CronTaskHandleProvider extends CommonController
                 $lastRun = [];
             }
 
-            $lastRun[app('tenant')->slug] = now();
+            $lastRun[currentTenant()->slug] = now();
             // Update last_run
             $task->last_run = $lastRun;
             $task->save();

app/Providers/GlobalDataProvider.php

@@ -22,7 +22,7 @@ class GlobalDataProvider {
     private ?User $user;
 
     public function __invoke() {
-        $this->user = auth()->user();
+        $this->user = currentUser();
 
         $canAccessAdmin = false;
         $isMainAdmin = false;
@@ -38,7 +38,7 @@ class GlobalDataProvider {
         return response()->json([
             'user' => null !== $this->user ? new UserResource($this->user)->toArray(request()) : null,
             'navbar' => $this->generateNavbar(),
-            'tenant' => app('tenant'),
+            'tenant' => currentTenant(),
             'activeUsers' => $this->getActiveUsers(),
             'version' => config('app.version'),
             'currentEvent' => $this->getCurrentEventData(),
@@ -189,8 +189,8 @@ class GlobalDataProvider {
         $activeUsers = [];
         $conditions = ['active' => true];
 
-        if (app('tenant')->slug !== 'lv') {
-            $conditions['local_group'] = app('tenant')->slug;
+        if (currentTenant()->slug !== 'lv') {
+            $conditions['local_group'] = currentTenant()->slug;
         }
 
         foreach ($rawUsers = User::where($conditions)->get() as $user) {

app/Providers/InertiaProvider.php

@@ -16,7 +16,7 @@ final class InertiaProvider
     private ?User $user;
 
     public function __construct(string $vueFile, array $props) {
-        $this->user = auth()->user();
+        $this->user = currentUser();
         $this->vueFile = $vueFile;
         $this->props = $props;
     }

app/Providers/TenantUserProvider.php

@@ -20,7 +20,7 @@ class TenantUserProvider extends EloquentUserProvider
         }
 
         // Auf "lv" gilt grundsätzlich keine local_group-Einschränkung.
-        if (app('tenant')->slug === 'lv') {
+        if (currentTenant()->slug === 'lv') {
             return $query->first();
         }
 
@@ -30,7 +30,7 @@ class TenantUserProvider extends EloquentUserProvider
         //     -> "Bundesrecht steht über Landesrecht": Login überall möglich.
         $query->where('active', true)
             ->where(function ($q) {
-                $q->where('local_group', app('tenant')->slug)
+                $q->where('local_group', currentTenant()->slug)
                   ->orWhere('user_role_main', UserRole::USER_ROLE_ADMIN);
             });
 

app/Providers/UploadFileProvider.php

@@ -25,7 +25,7 @@ class UploadFileProvider {
      * wo alle anderen Belege liegen.
      */
     public static function directoryFor(CostUnit $costUnit) : string {
-        return sprintf('%1$s/invoices/%2$s', app('tenant')->slug, $costUnit->id);
+        return sprintf('%1$s/invoices/%2$s', currentTenant()->slug, $costUnit->id);
     }
 
     public function saveUploadedFile() : ?InvoiceFile {