diff --git a/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php b/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php index 86c59e8871..f628674278 100644 --- a/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php +++ b/backend/app/Http/Actions/Users/ConfirmEmailAddressAction.php @@ -23,13 +23,13 @@ public function __construct( /** * @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 e443871b8a..dcf7a826c7 100644 --- a/backend/app/Http/Actions/Users/ConfirmEmailChangeAction.php +++ b/backend/app/Http/Actions/Users/ConfirmEmailChangeAction.php @@ -27,13 +27,13 @@ public function __construct(ConfirmEmailChangeHandler $confirmEmailChangeHandler /** * @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 0436f85c58..fce8aff880 100644 --- a/backend/routes/api.php +++ b/backend/routes/api.php @@ -165,11 +165,11 @@ function (Router $router): void { $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