Merge pull request #1192 from Kamidu/master

Enable user's last name in the email template
revert-70aa11f8
Kamidu Sachith Punchihewa 7 years ago committed by GitHub
commit 22929c3886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -151,6 +151,7 @@ public class UserManagementServiceImpl implements UserManagementService {
String recipient = userInfo.getEmailAddress();
Properties props = new Properties();
props.setProperty("first-name", userInfo.getFirstname());
props.setProperty("last-name", userInfo.getLastname());
props.setProperty("username", username);
props.setProperty("password", initialUserPassword);
@ -609,10 +610,15 @@ public class UserManagementServiceImpl implements UserManagementService {
Properties props = new Properties();
String username = DeviceMgtAPIUtils.getAuthenticatedUser();
String firstName = getClaimValue(username, Constants.USER_CLAIM_FIRST_NAME);
String lastName = getClaimValue(username, Constants.USER_CLAIM_LAST_NAME);
if (firstName == null) {
firstName = username;
}
if (lastName == null) {
lastName = "";
}
props.setProperty("first-name", firstName);
props.setProperty("last-name", lastName);
props.setProperty("device-type", enrollmentInvitation.getDeviceType());
EmailMetaInfo metaInfo = new EmailMetaInfo(recipients, props);
dms.sendEnrolmentInvitation(getEnrollmentTemplateName(enrollmentInvitation.getDeviceType()), metaInfo);

Loading…
Cancel
Save