Merge remote-tracking branch 'origin/bugfix/10.6.3/add-organization-name-settings' into bugfix/10.7.1/add-organization-name-settings

Author: mjabascal10

backend/src/main/java/com/park/utmstack/config/Constants.java

@@ -18,6 +18,7 @@ public final class Constants {
     public static final String PROP_MAIL_PORT = "utmstack.mail.port";
     public static final String PROP_MAIL_PASSWORD = "utmstack.mail.password";
     public static final String PROP_MAIL_USERNAME = "utmstack.mail.username";
+    public static final String PROP_MAIL_ORGNAME = "utmstack.mail.organization";
     public static final String PROP_MAIL_SMTP_AUTH = "utmstack.mail.properties.mail.smtp.auth";
 
     public static final String PROP_EMAIL_PROTOCOL_VALUE = "smtp";

backend/src/main/java/com/park/utmstack/service/mail_config/MailConfigService.java

@@ -5,18 +5,20 @@
 import com.park.utmstack.domain.mail_sender.MailConfig;
 import org.springframework.stereotype.Service;
 
+import javax.mail.internet.InternetAddress;
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 
 @Service
 public class MailConfigService {
-    public MailConfig getMailConfigFromParameters(List<UtmConfigurationParameter> parameters){
+    public MailConfig getMailConfigFromParameters(List<UtmConfigurationParameter> parameters) throws UnsupportedEncodingException {
         MailConfig mailConfig = new MailConfig();
 
         mailConfig.setHost(getParamValue(parameters, Constants.PROP_MAIL_HOST));
         mailConfig.setUsername(getParamValue(parameters, Constants.PROP_MAIL_USERNAME));
         mailConfig.setPassword(getParamValue(parameters, Constants.PROP_MAIL_PASSWORD));
         mailConfig.setAuthType(getParamValue(parameters, Constants.PROP_MAIL_SMTP_AUTH));
-        mailConfig.setFrom(getParamValue(parameters, Constants.PROP_MAIL_FROM));
+        mailConfig.setFrom(String.valueOf(new InternetAddress(Constants.CFG.get(Constants.PROP_MAIL_FROM), getParamValue(parameters, Constants.PROP_MAIL_ORGNAME))));
         mailConfig.setPort(Integer.parseInt(getParamValue(parameters, Constants.PROP_MAIL_PORT)));
 
         return mailConfig;