Skip to content

Commit 99d877d

Browse files
Merge pull request #7 from cedricduffournet/confirm_url_reset_message
Send confirmation url from user in reset password email
2 parents 00cbe56 + 56c0c73 commit 99d877d

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

app/src/Controller/PublicController.php

+9-1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@ public function __construct(
6767
* required=true,
6868
* type="string"
6969
* ),
70+
* @SWG\Parameter(
71+
* name="confirmationUrl",
72+
* in="formData",
73+
* description="Wich url validate confirmation",
74+
* required=true,
75+
* type="string"
76+
* ),
7077
* @SWG\Response(
7178
* response="200",
7279
* description="Returned when successful"
@@ -333,7 +340,6 @@ private function resetMailConfirm(User $user, Request $request): GetResponseUser
333340
/* @var $tokenGenerator TokenGeneratorInterface */
334341
$user->setConfirmationToken($this->tokenGenerator->generateToken());
335342
}
336-
337343
/* Dispatch confirm event */
338344
$event = new GetResponseUserEvent($user, $request);
339345
$this->eventDispatcher->dispatch(FOSUserEvents::RESETTING_SEND_EMAIL_CONFIRM, $event);
@@ -345,6 +351,8 @@ private function resetMailComplete(User $user, Request $request): GetResponseUse
345351
{
346352
$this->mailer->sendResettingEmailMessage($user);
347353
$user->setPasswordRequestedAt(new \DateTime());
354+
$confirmationUrl = $request->request->get('confirmationUrl');
355+
$user->setConfirmationUrl($confirmationUrl);
348356
$this->userManager->updateUser($user);
349357

350358
/* Dispatch completed event */

app/templates/Resetting/resetting.email.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{% block body_html %}
77
{{ 'general.email.hello'|trans({'%firstname%': user.firstname, '%lastname%': user.lastname})}},<br />
88
<br />
9-
{{ 'resetting.email.message'|trans }} <a href="{{confirmationUrl|replace({'%23':'#'})}}">ICI</a>.<br />
9+
{{ 'resetting.email.message'|trans }} <a href="{{user.confirmationUrl|replace({'%23':'#','token':user.confirmationToken})}}">ICI</a>.<br/>
1010
<br />
1111
{{'common.cordially'|trans}},<br />
1212
{{'common.theteam'|trans}}

0 commit comments

Comments
 (0)