community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1192 from Kamidu/master

Browse Source 
Enable user's last name in the email template
This commit is contained in:
Kamidu Sachith Punchihewa 2018-02-23 15:13:06 +05:30 committed by GitHub
commit 22929c3886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
View File

@ -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);