fix: Encode userName and correct placeholder for userResetPasswordLink (

#19139)
open-metadata · Dec 19, 2024 · fb6cbce · fb6cbce
1 parent 2b6cdea
commit fb6cbce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...data-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java b/...data-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java
@@ -184,7 +184,7 @@ public void sendEmailVerification(UriInfo uriInfo, User user) throws IOException
           String.format(
               "%s/users/registrationConfirmation?user=%s&token=%s",
               getSmtpSettings().getOpenMetadataUrl(),
-              user.getFullyQualifiedName(),
+              URLEncoder.encode(user.getFullyQualifiedName(), StandardCharsets.UTF_8),
               mailVerificationToken);
       try {
         EmailUtil.sendEmailVerification(emailVerificationLink, user);

diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/email/EmailUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/email/EmailUtil.java
@@ -30,6 +30,7 @@
 import static org.openmetadata.service.util.email.TemplateConstants.INVITE_RANDOM_PASSWORD_TEMPLATE;
 import static org.openmetadata.service.util.email.TemplateConstants.INVITE_SUBJECT;
 import static org.openmetadata.service.util.email.TemplateConstants.PASSWORD;
+import static org.openmetadata.service.util.email.TemplateConstants.PASSWORD_RESET_LINKKEY;
 import static org.openmetadata.service.util.email.TemplateConstants.PASSWORD_RESET_SUBJECT;
 import static org.openmetadata.service.util.email.TemplateConstants.REPORT_SUBJECT;
 import static org.openmetadata.service.util.email.TemplateConstants.SUPPORT_URL;
@@ -179,7 +180,7 @@ public static void sendPasswordResetLink(
               .add(ENTITY, getSmtpSettings().getEmailingEntity())
               .add(SUPPORT_URL, getSmtpSettings().getSupportUrl())
               .add(USERNAME, user.getName())
-              .add(EMAIL_VERIFICATION_LINKKEY, passwordResetLink)
+              .add(PASSWORD_RESET_LINKKEY, passwordResetLink)
               .add(EXPIRATION_TIME_KEY, DEFAULT_EXPIRATION_TIME)
               .build();