Merge pull request #8 from savannabits/development

Bug Fix in HasTeam: referencing auth()->user()->team was causing null…
savannabits · Oct 22, 2023 · 24fd387 · 24fd387
2 parents c86a06c + 61983bd
commit 24fd387
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Concerns/Model/HasTeam.php b/src/Concerns/Model/HasTeam.php
@@ -38,8 +38,15 @@ public static function bootHasTeam()
                     return;
                 }
                 if (Schema::hasColumn($query->getModel()->getTable(),'team_id')) {
-                    $query->whereBelongsTo(auth()->user()->team)->orWhereNull('team_id')
-                        ->orWhere('team_id','=', default_team()?->id);
+                    $user = auth()->user();
+                    if ($user) {
+                        $query->whereBelongsTo($user->team)
+                            ->orWhereNull('team_id')
+                            ->orWhere('team_id','=', default_team()?->id);
+                    } else  {
+                        $query->whereNull('team_id')
+                            ->orWhere('team_id','=', default_team()?->id);
+                    }
                 }
 //                $query->where('team_id', auth()->user()->team_id);
                 // or with a `team` relationship defined: