Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Fix email confirmation not working (#432)

Dave Earley6c4915d87c9f
diff --git a/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php b/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php
index 86c59e887..f62867427 100644
--- a/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php
+++ b/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php
@@ -23,13 +23,13 @@ class ConfirmEmailAddressAction extends BaseAction
/**
* @throws DecryptionFailedException|Throwable
*/
- public function __invoke(int $userId, string $token): Response|JsonResponse
+ public function __invoke(int $userId, string $resetToken): Response|JsonResponse
{
$this->isActionAuthorized($userId, UserDomainObject::class);
try {
$this->confirmEmailAddressHandler->handle(new ConfirmEmailChangeDTO(
- token: $token,
+ token: $resetToken,
accountId: $this->getAuthenticatedAccountId(),
));
} catch (EncryptedPayloadExpiredException) {
diff --git a/backend/app/Http/Actions/Users/ConfirmEmailChangeAction.php b/backend/app/Http/Actions/Users/ConfirmEmailChangeAction.php
index e443871b8..dcf7a826c 100644
--- a/backend/app/Http/Actions/Users/ConfirmEmailChangeAction.php
+++ b/backend/app/Http/Actions/Users/ConfirmEmailChangeAction.php
@@ -27,13 +27,13 @@ class ConfirmEmailChangeAction extends BaseAction
/**
* @throws DecryptionFailedException|Throwable
*/
- public function __invoke(int $userId, string $token): Response|JsonResponse
+ public function __invoke(int $userId, string $changeToken): Response|JsonResponse
{
$this->isActionAuthorized($userId, UserDomainObject::class);
try {
$user = $this->confirmEmailChangeHandler->handle(new ConfirmEmailChangeDTO(
- token: $token,
+ token: $changeToken,
accountId: $this->getAuthenticatedAccountId(),
));
} catch (EncryptedPayloadExpiredException) {
diff --git a/backend/routes/api.php b/backend/routes/api.php
index 0436f85c5..fce8aff88 100644
--- a/backend/routes/api.php
+++ b/backend/routes/api.php
@@ -165,11 +165,11 @@ $router->middleware(['auth:api'])->group(
$router->get('/users', GetUsersAction::class);
$router->get('/users/{user_id}', GetUserAction::class);
$router->put('/users/{user_id}', UpdateUserAction::class);
- $router->post('/users/{user_id}/email-change/{token}', ConfirmEmailChangeAction::class);
+ $router->post('/users/{user_id}/email-change/{changeToken}', ConfirmEmailChangeAction::class);
$router->post('/users/{user_id}/invitation', ResendInvitationAction::class);
$router->delete('/users/{user_id}/invitation', DeleteInvitationAction::class);
$router->delete('/users/{user_id}/email-change', CancelEmailChangeAction::class);
- $router->post('/users/{user_id}/confirm-email/{token}', ConfirmEmailAddressAction::class);
+ $router->post('/users/{user_id}/confirm-email/{resetToken}', ConfirmEmailAddressAction::class);
$router->post('/users/{user_id}/resend-email-confirmation', ResendEmailConfirmationAction::class);
// Accounts