refactor: logic for only_logged_in policy

mwargan · mwargan · commit 7ac9978d85d9 · 2024-04-13T15:30:55.000Z
diff --git a/app/Policies/MarkerPolicy.php b/app/Policies/MarkerPolicy.php
@@ -58,8 +58,8 @@ public function create(?User $user, Map $map, $token = null)
         if ($user && $map->user_id == $user->id) {
             return true;
         }
-        if ($map->users_can_create_markers == 'only_logged_in') {
-            return $user && $user->hasVerifiedEmail() && $user->can('create markers');
+        if ($map->users_can_create_markers == 'only_logged_in' && $user && $user->hasVerifiedEmail() && $user->can('create markers')) {
+            return true;
         }
         // If the user is a member of the map and has the `can_create_markers` permission, they can create markers
         if ($user && $map->users->contains($user) && $map->users->find($user->id)->pivot->can_create_markers) {

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ public function create(?User $user, Map $map, $token = null)`
`58`	`58`	`if ($user && $map->user_id == $user->id) {`
`59`	`59`	`return true;`
`60`	`60`	`}`
`61`		`- if ($map->users_can_create_markers == 'only_logged_in') {`
`62`		`- return $user && $user->hasVerifiedEmail() && $user->can('create markers');`
	`61`	`+ if ($map->users_can_create_markers == 'only_logged_in' && $user && $user->hasVerifiedEmail() && $user->can('create markers')) {`
	`62`	`+ return true;`
`63`	`63`	`}`
`64`	`64`	// If the user is a member of the map and has the `can_create_markers` permission, they can create markers
`65`	`65`	`if ($user && $map->users->contains($user) && $map->users->find($user->id)->pivot->can_create_markers) {`