improve email verify.
All checks were successful
Deploy / Build (push) Successful in 5m40s

This commit is contained in:
amass 2024-12-25 22:07:00 +08:00
parent 41ca855d06
commit fed59acef3
5 changed files with 46 additions and 44 deletions

View File

@ -6,13 +6,13 @@
// BOOST_AUTO_TEST_CASE(MailTest) { // BOOST_AUTO_TEST_CASE(MailTest) {
// Wt::Mail::Client client; // Wt::Mail::Client client;
// client.enableAuthentication("17688947728@163.com", "yourpassword", Wt::Mail::AuthenticationMethod::Login); // client.enableAuthentication("168062547@qq.com", "yourpassword", Wt::Mail::AuthenticationMethod::Login);
// client.setTransportEncryption(Wt::Mail::TransportEncryption::TLS); // client.setTransportEncryption(Wt::Mail::TransportEncryption::TLS);
// LOG(info) << client.connect("smtp.163.com", 465); // LOG(info) << client.connect("smtp.qq.com", 465);
// Wt::Mail::Mailbox from("17688947728@163.com"); // Wt::Mail::Mailbox from("168062547@qq.com");
// Wt::Mail::Mailbox to("168062547@qq.com"); // Wt::Mail::Mailbox to("amass.law1996@gmail.com");
// Wt::Mail::Message message; // Wt::Mail::Message message;
// message.setFrom(from); // message.setFrom(from);

View File

@ -137,7 +137,7 @@ Server::Server(uint16_t port, const std::string &applicationRoot, const std::str
std::bind(&Server::createApplication, this, std::placeholders::_1, false)); std::bind(&Server::createApplication, this, std::placeholders::_1, false));
m_server->addEntryPoint(Wt::EntryPointType::WidgetSet, m_server->addEntryPoint(Wt::EntryPointType::WidgetSet,
std::bind(&Server::createApplication, this, std::placeholders::_1, true), "/wt/app.js"); std::bind(&Server::createApplication, this, std::placeholders::_1, true), "/wt/app.js");
m_server->addResource(std::make_shared<AuthenticationResource>(), "/auth"); m_server->addResource(std::make_shared<AuthenticationResource>(), "/auth/verify");
m_server->addResource(std::make_shared<PlaintextResource>(), "/plaintext"); m_server->addResource(std::make_shared<PlaintextResource>(), "/plaintext");
m_server->start(); m_server->start();

View File

@ -26,11 +26,11 @@ void BulmaTheme::init(Wt::WApplication *app) const {
} }
std::string BulmaTheme::disabledClass() const { std::string BulmaTheme::disabledClass() const {
return ""; return "bulma-is-disabled"; // bulma 没有这个类
} }
std::string BulmaTheme::activeClass() const { std::string BulmaTheme::activeClass() const {
return ""; return "bulma-is-active";
} }
std::string BulmaTheme::utilityCssClass(int utilityCssClassRole) const { std::string BulmaTheme::utilityCssClass(int utilityCssClassRole) const {

View File

@ -38,7 +38,7 @@
${tr:Wt.Auth.password} ${tr:Wt.Auth.password}
</label> </label>
<div class="bulma-control bulma-has-icons-left"> <div class="bulma-control bulma-has-icons-left">
${password class="bulma-input"} ${password class="bulma-input" type="password"}
<span class="bulma-icon bulma-is-small bulma-is-left"> <span class="bulma-icon bulma-is-small bulma-is-left">
<i class="fa-solid fa-lock"></i> <i class="fa-solid fa-lock"></i>
</span> </span>
@ -248,4 +248,27 @@
</div> </div>
</div> </div>
</message> </message>
<message id="Wt.Auth.template.resend-email-verification">
<p>${tr:Wt.Auth.resend-verification-msg}</p>
<div class="bulma-field">
<label for="${id:email}" class="bulma-label">${tr:Wt.Auth.email}</label>
<div class="bulma-control bulma-has-icons-left">
${email class="bulma-input" type="email"}
<span class="bulma-icon bulma-is-small bulma-is-left">
<i class="fas fa-envelope"></i>
</span>
</div>
<span class="bulma-help"> ${email-info} </span>
</div>
<div class="bulma-field bulma-is-grouped bulma-is-grouped-right">
<div class="bulma-control">
${send-button class="bulma-button bulma-is-link"}
</div>
<div class="bulma-control">
${cancel-button class="bulma-button bulma-is-link bulma-is-light"}
</div>
</div>
</message>
</messages> </messages>

View File

@ -90,10 +90,10 @@
<message id="Wt.Auth.throttle-retry">{1}s后重试</message> <message id="Wt.Auth.throttle-retry">{1}s后重试</message>
<message id="Wt.Auth.resend-email-verification">重新发送?</message> <message id="Wt.Auth.resend-email-verification">重新发送?</message>
<message id="Wt.Auth.resend-verification-title">Resend Email Verification</message> <message id="Wt.Auth.resend-verification-title">重新发送邮件验证</message>
<message id="Wt.Auth.resend-verification-msg">Please enter your email address again below to resend the verification email. Make sure to check your spam folder in case the email does not show up in your inbox.</message> <message id="Wt.Auth.resend-verification-msg">请在下方再次输入您的电子邮箱地址以重新发送验证邮件。如果收件箱中未收到邮件,请务必查看垃圾邮件文件夹。</message>
<message id="Wt.Auth.resend-email-error">Email address does not match this user</message> <message id="Wt.Auth.resend-email-error">电子邮箱地址与该用户不匹配</message>
<message id="Wt.Auth.verification-sent-title">Email verification</message> <message id="Wt.Auth.verification-sent-title">邮箱验证</message>
<!-- RegistrationWidget --> <!-- RegistrationWidget -->
@ -155,59 +155,38 @@
<!-- Emails --> <!-- Emails -->
<message id="Wt.Auth.confirmmail.subject">User account activation Link</message> <message id="Wt.Auth.confirmmail.subject">用户帐号激活链接</message>
<message id="Wt.Auth.confirmmail.body"> <message id="Wt.Auth.confirmmail.body">
Hello {1}, Hello {1},
Thank you for joining! 感谢您的参与!
To complete your registration, please finally confirm your account by 要完成您的注册请最后确认您的帐户点击以下链接或将URL复制到您的浏览器中。
clicking on the following link or copying the URL into your browser.
Please click here to confirm your registration or copy and paste the 请点击此处确认您的注册,或者将以下网址复制粘贴到您的浏览器中:(注意:请确保复制整个网址,包括任何延续到第二行的部分。)
following URL into your browser: (Note: be sure to copy the entire
URL, including any part of it which goes onto a second line.)
{3} {3}
This text is resolved from the "Wt.Auth.confirmmail.subject", 再次感觉您的参与,希望这能为您带来点什么~
"Wt.Auth.confirmmail.body", and "Wt.Auth.confirmmail.htmlbody"
resource keys.
Good luck with your Wt application, amass.
The Wt team.
</message> </message>
<message id="Wt.Auth.confirmmail.htmlbody"> <message id="Wt.Auth.confirmmail.htmlbody">
<h3>Hello {1},</h3> <h3>Hello {1},</h3>
<p>Thank you for joining!</p> <p>感谢您的参与!</p>
<p>To complete your registration, please finally confirm your <p>要完成您的注册请最后确认您的帐户点击以下链接或将URL复制到您的浏览器中。</p>
account by clicking on the following link or copying the URL into
your browser.</p>
<p>Please <a href="{3}">click here to confirm</a> your <p><a href="{3}">点击此处确认</a> 您的注册,或者将以下网址复制粘贴到您的浏览器中: <i>(注意:请确保复制整个网址,包括任何延续到第二行的部分。)</i></p>
registration or copy and paste the following URL into your
browser: <i>(Note: be sure to copy the entire URL, including any
part of it which goes onto a second line.)</i></p>
<b>{3}</b> <b>{3}</b>
<p> <p>再次感觉您的参与,希望这能为您带来点什么~</p>
<i>Note to developer:</i>
</p>
<p>
This text is resolved from the "Wt.Auth.confirmmail.subject",
"Wt.Auth.confirmmail.body", and "Wt.Auth.confirmmail.htmlbody"
resource keys.
</p>
<p>Good luck with your Wt application,</p> <p>amass.</p>
<p>The Wt team.</p>
</message> </message>
<message id="Wt.Auth.lostpasswordmail.subject">Lost password instructions</message> <message id="Wt.Auth.lostpasswordmail.subject">Lost password instructions</message>