Skip to content

Fix url in password reset email #12078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: 4.22
Choose a base branch
from
Draft

Fix url in password reset email #12078

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed34842
Fix url in password reset email
sureshanaparti Nov 14, 2025
8c22f84
Update server/src/main/java/org/apache/cloudstack/user/UserPasswordRe…
sureshanaparti Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions server/src/main/java/org/apache/cloudstack/user/UserPasswordResetManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import java.util.Set;
import java.util.UUID;

import static org.apache.cloudstack.config.ApiServiceConfiguration.ManagementServerAddresses;
import static org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetToken;
import static org.apache.cloudstack.resourcedetail.UserDetailVO.PasswordResetTokenExpiryDate;

Expand All @@ -68,7 +69,7 @@ public class UserPasswordResetManagerImpl extends ManagerBase implements UserPas
new ConfigKey<>(ConfigKey.CATEGORY_ADVANCED, String.class,
"user.password.reset.mail.template", "Hello {{username}}!\n" +
"You have requested to reset your password. Please click the following link to reset your password:\n" +
"{{{domainUrl}}}{{{resetLink}}}\n" +
"{{{resetLink}}}\n" +
"If you did not request a password reset, please ignore this email.\n" +
"\n" +
"Regards,\n" +
Expand Down Expand Up @@ -179,10 +180,14 @@ public void setResetTokenAndSend(UserAccount userAccount) {
final String email = userAccount.getEmail();
final String username = userAccount.getUsername();
final String subject = "Password Reset Request";
final String domainUrl = UserPasswordResetDomainURL.value();
String domainUrl = UserPasswordResetDomainURL.value();
if (StringUtils.isBlank(domainUrl)) {
domainUrl = ManagementServerAddresses.value().split(",")[0];
}
domainUrl = domainUrl.trim().replaceAll("/+$", "");

String resetLink = String.format("/client/#/user/resetPassword?username=%s&token=%s",
username, resetToken);
String resetLink = String.format("%s/client/#/user/resetPassword?username=%s&token=%s",
domainUrl, username, resetToken);
String content = getMessageBody(userAccount, resetToken, resetLink);

SMTPMailProperties mailProperties = new SMTPMailProperties();
Expand Down
Loading