Merge pull request #917 from mozilla/redirect-to-dashboard-911
fix #911: redirect verify email visits to dashboard
This commit is contained in:
Коммит
f338d75c46
|
@ -207,13 +207,7 @@ async function verify(req, res) {
|
||||||
await _verify(req);
|
await _verify(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
res.render("subpage", {
|
res.redirect("/user/dashboard");
|
||||||
headline: req.fluentFormat("confirmation-headline"),
|
|
||||||
subhead: req.fluentFormat("confirmation-blurb"),
|
|
||||||
title: req.fluentFormat("user-verify-title"),
|
|
||||||
whichPartial: "subpages/confirm",
|
|
||||||
emailLinks: EmailUtils.getShareByEmail(req),
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -177,7 +177,7 @@ test("user verify request with valid token verifies user", async () => {
|
||||||
// Call code-under-test
|
// Call code-under-test
|
||||||
await user.verify(req, resp);
|
await user.verify(req, resp);
|
||||||
|
|
||||||
expect(resp.statusCode).toEqual(200);
|
expect(resp.statusCode).toEqual(302);
|
||||||
const emailAddress = await DB.getEmailByToken(validToken);
|
const emailAddress = await DB.getEmailByToken(validToken);
|
||||||
expect(emailAddress.verified).toBeTruthy();
|
expect(emailAddress.verified).toBeTruthy();
|
||||||
});
|
});
|
||||||
|
@ -220,7 +220,7 @@ test("user verify request for already verified user doesn't send extra email", a
|
||||||
// Call code-under-test
|
// Call code-under-test
|
||||||
await user.verify(mockRequest, resp);
|
await user.verify(mockRequest, resp);
|
||||||
|
|
||||||
expect(resp.statusCode).toEqual(200);
|
expect(resp.statusCode).toEqual(302);
|
||||||
const emailAddress = await DB.getEmailByToken(alreadyVerifiedToken);
|
const emailAddress = await DB.getEmailByToken(alreadyVerifiedToken);
|
||||||
expect(emailAddress.verified).toBeTruthy();
|
expect(emailAddress.verified).toBeTruthy();
|
||||||
expect(EmailUtils.sendEmail).not.toHaveBeenCalled();
|
expect(EmailUtils.sendEmail).not.toHaveBeenCalled();
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
<p>WIP // TODO : Redirect to <a href="/">User Dashboard </a>on Email Confirmation.</p>
|
|
Загрузка…
Ссылка в новой задаче