Skip to content

main <- develop #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daveearley merged 2 commits into from
Mar 13, 2025
Merged

main <- develop #435

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
881f282
Fix event visibility for users from another account
daveearley Mar 13, 2025
ebeb8dd
Merge pull request #434 from HiEventsDev/fix/event-visiblity-for-logg…
daveearley Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion backend/app/Http/Actions/Events/GetEventPublicAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace HiEvents\Http\Actions\Events;

use HiEvents\DomainObjects\EventDomainObject;
use HiEvents\DomainObjects\Status\EventStatus;
use HiEvents\Http\Actions\BaseAction;
use HiEvents\Resources\Event\EventResourcePublic;
Expand Down Expand Up @@ -30,7 +31,7 @@ public function __invoke(int $eventId, Request $request): Response|JsonResponse
'isAuthenticated' => $this->isUserAuthenticated(),
]));

if ($event->getStatus() !== EventStatus::LIVE->name && !$this->isUserAuthenticated()) {
if (!$this->canUserViewEvent($event)) {
$this->logger->debug(__('Event with ID :eventId is not live and user is not authenticated', [
'eventId' => $eventId
]));
Expand All @@ -40,4 +41,17 @@ public function __invoke(int $eventId, Request $request): Response|JsonResponse

return $this->resourceResponse(EventResourcePublic::class, $event);
}

private function canUserViewEvent(EventDomainObject $event): bool
{
if ($event->getStatus() === EventStatus::LIVE->name) {
return true;
}

if ($this->isUserAuthenticated() && $event->getAccountId() === $this->getAuthenticatedAccountId()) {
return true;
}

return false;
}
}
Loading