Skip to content

fix: invitation accept-link rendering as null in invite/resend/update emails #2056

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

Open
samark231 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: invitation accept-link rendering as null in invite/resend/update emails #2056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions ...vice/src/main/java/vacademy/io/auth_service/feature/user/service/InviteUserEmailBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
package vacademy.io.auth_service.feature.user.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Value;

public class InviteUserEmailBody {

@Value("${teacher.portal.client.url}:https://dash.vacademy.io")
private static String adminPortalClientUrl;

public static final String ADMIN_LOGIN_URL = adminPortalClientUrl + "/login";

public static String createInviteUserEmail(
String name,
String username,
Expand Down Expand Up @@ -97,7 +91,7 @@ public static String createInviteUserEmail(
""".formatted(themeColor, name, username, password, rolesFormatted, adminLoginUrl,instituteName);
}

public static String createReminderEmail(String name, String username, String password, List<String> roles) {
public static String createReminderEmail(String name, String username, String password, List<String> roles, String adminLoginUrl) {
String rolesFormatted = String.join(", ", roles);

return """
Expand Down Expand Up @@ -191,6 +185,6 @@ public static String createReminderEmail(String name, String username, String pa
</div>
</body>
</html>
""".formatted(name, username, password, rolesFormatted, ADMIN_LOGIN_URL);
""".formatted(name, username, password, rolesFormatted, adminLoginUrl);
}
}
19 changes: 15 additions & 4 deletions ...ervice/src/main/java/vacademy/io/auth_service/feature/user/service/InviteUserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ private void sendInvitationEmail(UserDTO userDTO, String instituteId) {
instituteName=instituteInfoDTO.getInstituteName();
if(instituteInfoDTO.getInstituteThemeCode()!=null)
theme=instituteInfoDTO.getInstituteThemeCode();
if(instituteInfoDTO.getLearnerPortalUrl()!=null)
adminLoginUrl=instituteInfoDTO.getAdminPortalUrl();
if(StringUtils.hasText(instituteInfoDTO.getAdminPortalUrl()))
adminLoginUrl=normalizeUrl(instituteInfoDTO.getAdminPortalUrl());
}
GenericEmailRequest emailRequest = createEmailRequest(
userDTO.getEmail(), "Invitation Mail",
Expand All @@ -102,15 +102,26 @@ private void sendReminderEmail(User user) {
if (user.getRoles() != null && !user.getRoles().isEmpty()) {
instituteId = user.getRoles().iterator().next().getInstituteId();
}


String adminLoginUrl = "https://dash.vacademy.io";
if (StringUtils.hasText(instituteId)) {
InstituteInfoDTO instituteInfoDTO = instituteInternalService.getInstituteByInstituteId(instituteId);
if (instituteInfoDTO != null && StringUtils.hasText(instituteInfoDTO.getAdminPortalUrl()))
adminLoginUrl = normalizeUrl(instituteInfoDTO.getAdminPortalUrl());
}

GenericEmailRequest emailRequest = createEmailRequest(
user.getEmail(), "Invitation Reminder Mail",
InviteUserEmailBody.createReminderEmail(
user.getFullName(), user.getUsername(), user.getPassword(), getUserRoleNames(user))
user.getFullName(), user.getUsername(), user.getPassword(), getUserRoleNames(user), adminLoginUrl)
);
notificationService.sendGenericHtmlMailViaUnified(emailRequest, instituteId);
}

private String normalizeUrl(String url) {
return url.startsWith("http") ? url : "https://" + url;
}

private ModifyUserRolesDTO createModifyRolesDTO(String userId, String instituteId, List<String> roles) {
ModifyUserRolesDTO modifyUserRolesDTO = new ModifyUserRolesDTO();
modifyUserRolesDTO.setUserId(userId);
Expand Down