Skip to content

main <- develop #229

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 3 commits into from
Sep 15, 2024
Merged

main <- develop #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb12636
Update README.md
daveearley Sep 15, 2024
17ad9c4
Fix session ID causing checkout failures in some situations
daveearley Sep 15, 2024
1b84773
Merge pull request #228 from HiEventsDev/fix-session-id-generation
daveearley Sep 15, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
[![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/HiEventsTickets)](https://x.com/HiEventsTickets)
<br/>
[![Hi.Events docs](https://img.shields.io/badge/docs-hi.events-blue)](https://hi.events/docs)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](https://github.com/HiEventsDev/hi.events/LICENCE)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](https://github.com/HiEventsDev/Hi.Events/blob/develop/LICENCE)
[![GitHub Release](https://img.shields.io/github/v/release/HiEventsDev/hi.events?include_prereleases)](https://github.com/HiEventsDev/hi.events/releases)
[![Run Unit Tests](https://github.com/HiEventsDev/hi.events/actions/workflows/unit-tests.yml/badge.svg?event=push)](https://github.com/HiEventsDev/hi.events/actions/workflows/unit-tests.yml)
[![Docker Pulls](https://img.shields.io/docker/pulls/daveearley/hi.events-all-in-one)](https://hub.docker.com/r/daveearley/hi.events-all-in-one)
Expand Down
12 changes: 7 additions & 5 deletions backend/app/Services/Infrastructure/Session/CheckoutSessionManagementService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ class CheckoutSessionManagementService
{
private const SESSION_IDENTIFIER = 'session_identifier';

private ?string $sessionId = null;

public function __construct(
private readonly Request $request,
)
Expand All @@ -22,13 +24,13 @@ public function __construct(
*/
public function getSessionId(): string
{
$sessionId = $this->request->cookie(self::SESSION_IDENTIFIER);

if (!$sessionId) {
$sessionId = $this->createSessionId();
if ($this->sessionId) {
return $this->sessionId;
}

return $sessionId;
$this->sessionId = $this->request->cookie(self::SESSION_IDENTIFIER) ?? $this->createSessionId();

return $this->sessionId;
}

public function verifySession(string $identifier): bool
Expand Down