viranga
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update user welcome mail body

Browse Source
revert-70ac1926
tcdlpds@gmail.com 4 years ago
parent d53f56c96b
commit b1845d9b42
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File

1
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementConstants.java
Unescape View File

@ -117,6 +117,7 @@ public final class DeviceManagementConstants {
public static final String USER_REGISTRATION_TEMPLATE = "user-registration"; public static final String USER_REGISTRATION_TEMPLATE = "user-registration";
public static final String USER_ENROLLMENT_TEMPLATE = "user-enrollment"; public static final String USER_ENROLLMENT_TEMPLATE = "user-enrollment";
public static final String USER_VERIFY_TEMPLATE = "user-verify"; public static final String USER_VERIFY_TEMPLATE = "user-verify";
public static final String USER_WELCOME_TEMPLATE = "user-welcome";
public static final String DEFAULT_ENROLLMENT_TEMPLATE = "default-enrollment-invitation"; public static final String DEFAULT_ENROLLMENT_TEMPLATE = "default-enrollment-invitation";
} }

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/otp/mgt/service/OTPManagementServiceImpl.java
Unescape View File

@ -157,7 +157,7 @@ public class OTPManagementServiceImpl implements OTPManagementService {
invalidateOTP(oneTimeToken); invalidateOTP(oneTimeToken);
Properties props = new Properties(); Properties props = new Properties();
properties.forEach(props::setProperty); properties.forEach(props::setProperty);
sendMail(props, email); sendMail(props, email, DeviceManagementConstants.EmailAttributes.USER_WELCOME_TEMPLATE);
} catch (OTPManagementException e) { } catch (OTPManagementException e) {
String msg = "Error occurred while completing the self registration via OTP"; String msg = "Error occurred while completing the self registration via OTP";
log.error(msg, e); log.error(msg, e);

25
features/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm
Unescape View File

@ -43,41 +43,38 @@
</p> </p>
</div> </div>
<div> <div>
<h2>Access different portals</h2> <h3>Access different portals</h3>
<p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"> <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;">Your log-in credentials to any of our portals(endpoint-mgt, store, publisher) are,</p>
Your log-in credentials to any of our portals(endpoint-mgt, store, publisher) are the same as the <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"><b>Username: </b> $portal-username</p>
email (username) and password you provided during the registration for an evaluation account. <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"><b>Password: </b> password provided at registration for an evaluation account.</p>
</p> <h4>Endpoint management portal URL: <a href="$base-url-https/endpoint-mgt/">$base-url-https/endpoint-mgt/</a></h4>
<h3>Endpoint management portal URL: <a href="$base-url-https/endpoint-mgt/">$base-url-https/endpoint-mgt/</a></h3>
<p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;"> <p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;">
This is the portal used to send operations and policies to devices and overall management of This is the portal used to send operations and policies to devices and overall management of
the server. the server.
</p> </p>
<h3>Application store portal URL: <a href="$base-url-https/store">$base-url-https/store</a></h3> <h4>Application store portal URL: <a href="$base-url-https/store">$base-url-https/store</a></h4>
<p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;"> <p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;">
This is an in-house corporate app store where you can host all your corporate applications. This is an in-house corporate app store where you can host all your corporate applications.
Users may browse apps and install them to their devices if the administrator has made the apps Users may browse apps and install them to their devices if the administrator has made the apps
publicly visible to users. Administrator can install, uninstall and update apps in the user publicly visible to users. Administrator can install, uninstall and update apps in the user
device or device groups. device or device groups.
</p> </p>
<h3>Application publishing portal URL: <a href="$base-url-https/publisher">$base-url-https/publisher</a></h3> <h4>Application publishing portal URL: <a href="$base-url-https/publisher">$base-url-https/publisher</a></h4>
<p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;"> <p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;">
The portal for publishing new applications for internal use. This is the developer view of the The portal for publishing new applications for internal use. This is the developer view of the
enterprise application store that comes with the product. enterprise application store that comes with the product.
</p> </p>
</div> </div>
<div> <div>
<h2>Enroll a device</h2> <h3>Enroll a device</h3>
<p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;"> <p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;">
Please find here a set of videos on how to enroll and onboard devices to our Cloud platform. Please find here a set of videos on how to enroll and onboard devices to our Cloud platform.
<a href="https://entgra-documentation.gitlab.io/v4.0.0/docs/product-guide/enrollment-guide/enroll-cloud/">[Cloud Enrollment Guide]</a> <a href="https://entgra-documentation.gitlab.io/v4.0.0/docs/product-guide/enrollment-guide/enroll-cloud/">[Cloud Enrollment Guide]</a>
When enrolling a device, Make sure to use the following log-in format: When enrolling a device, Make sure to use the following log-in format:
</p> </p>
<p> <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"><b>Organisation:</b> $tenant-domain</p>
<b>Organisation:</b> $tenant-domain <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"><b>Username:</b> $agent-username</p>
<b>Username:</b> $email-address <p style="font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 5px 0px;"><b>Password:</b> password provided at registration.</p>
<b>Password:</b> password provided at registration.
</p>
</div> </div>
<div> <div>
<p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;"> <p style="font-length: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; margin: 20px 0px 5px;">

Write Preview
Loading…
Cancel
Save