Merge pull request #2589 from hongwei1/feature/replaceLiftMail

refactor/replace lift mail

Author: simonredfern

obp-api/pom.xml

@@ -101,6 +101,12 @@
       <artifactId>commons-text</artifactId>
       <version>1.10.0</version>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-email -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-email</artifactId>
+      <version>1.5</version>
+    </dependency>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
@@ -178,6 +184,11 @@
       <artifactId>httpclient</artifactId>
       <version>4.5.13</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-pool2</artifactId>
+      <version>2.11.1</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
@@ -661,24 +672,25 @@
           <release>${java.version}</release>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.scalaxb</groupId>
-        <artifactId>scalaxb-maven-plugin</artifactId>
-        <version>1.7.5</version>
-        <configuration>
-          <packageName>code.adapter.soap</packageName>
-          <wsdlDirectory>src/main/resources/custom_webapp/wsdl</wsdlDirectory>
-          <xsdDirectory>src/main/resources/custom_webapp/xsd</xsdDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <id>scalaxb</id>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+      <!--soap related plugin begin-->
+<!--      <plugin>-->
+<!--        <groupId>org.scalaxb</groupId>-->
+<!--        <artifactId>scalaxb-maven-plugin</artifactId>-->
+<!--        <version>1.7.5</version>-->
+<!--        <configuration>-->
+<!--          <packageName>code.adapter.soap</packageName>-->
+<!--          <wsdlDirectory>src/main/resources/custom_webapp/wsdl</wsdlDirectory>-->
+<!--          <xsdDirectory>src/main/resources/custom_webapp/xsd</xsdDirectory>-->
+<!--        </configuration>-->
+<!--        <executions>-->
+<!--          <execution>-->
+<!--            <id>scalaxb</id>-->
+<!--            <goals>-->
+<!--              <goal>generate</goal>-->
+<!--            </goals>-->
+<!--          </execution>-->
+<!--        </executions>-->
+<!--      </plugin>-->
       <!--grpc related plugin begin-->
       <!-- currently not need, enable this plugin when need generate new grpc code.
       <plugin>

obp-api/src/main/resources/props/sample.props.template

@@ -270,20 +270,70 @@ dev.port=8080
 #Default value is obp (very highly recomended)
 apiPathZero=obp
 
-## Sending mail out
-## Not need in dev mode, but important for production
-mail.api.consumer.registered.sender.address=no-reply@example.com
-mail.api.consumer.registered.notification.addresses=you@example.com
-## Not need in dev mode, but important for production
-## We send an email after any exception
-# mail.exception.sender.address=no-reply@example.com
-# mail.exception.registered.notification.addresses=notify@example.com,notify2@example.com,notify3@example.com
-# This property allows sending API registration data to developer's email.
-#mail.api.consumer.registered.notification.send=false
-We only send consumer keys and secret if this is true
-#mail.api.consumer.registered.notification.send.sensistive=false
+## Email Configuration (CommonsEmailWrapper)
+## ===========================================
+## 
+## This section configures email sending using CommonsEmailWrapper instead of Lift Mailer.
+## All email functionality (password reset, validation, notifications) now uses these settings.
+##
+## SMTP Server Configuration
+## -------------------------
+## Basic SMTP settings
 mail.smtp.host=127.0.0.1
 mail.smtp.port=25
+mail.smtp.auth=false
+mail.smtp.user=
+mail.smtp.password=
+
+## TLS/SSL Configuration
+## ---------------------
+## Enable STARTTLS (recommended for most SMTP servers)
+mail.smtp.starttls.enable=false
+## Enable SSL (use with port 465)
+mail.smtp.ssl.enable=false
+## TLS protocols to use (recommended: TLSv1.2)
+mail.smtp.ssl.protocols=TLSv1.2
+## Trust all certificates (for development only)
+#mail.smtp.ssl.trust=*
+
+## Debug Configuration
+## ------------------
+## Enable email debugging (shows SMTP communication)
+mail.debug=false
+
+## Email Sender Configuration
+## -------------------------
+## Default sender address for all emails
+mail.users.userinfo.sender.address=no-reply@example.com
+
+## Consumer Registration Email
+## --------------------------
+## Enable/disable consumer registration notifications
+mail.api.consumer.registered.notification.send=false
+## Sender address for consumer registration emails
+mail.api.consumer.registered.sender.address=no-reply@example.com
+## Recipient addresses for consumer registration notifications (comma-separated)
+mail.api.consumer.registered.notification.addresses=you@example.com
+## Send sensitive information (consumer keys/secrets) via email
+mail.api.consumer.registered.notification.send.sensistive=false
+
+## Exception Notification Email
+## ---------------------------
+## Sender address for exception notifications
+mail.exception.sender.address=no-reply@example.com
+## Recipient addresses for exception notifications (comma-separated)
+mail.exception.registered.notification.addresses=notify@example.com,notify2@example.com,notify3@example.com
+
+## Tesobe Mail Server:
+## mail.smtp.host=mail.tesobe.com
+## mail.smtp.port=25
+## mail.smtp.auth=true
+## mail.smtp.user=your-email@tesobe.com
+## mail.smtp.password=your-password
+## mail.smtp.starttls.enable=true
+## mail.smtp.ssl.enable=false
+## mail.smtp.ssl.protocols=TLSv1.2
+
 
 ## Oauth token timeout
 token_expiration_weeks=4

obp-api/src/main/scala/bootstrap/liftweb/Boot.scala

@@ -46,6 +46,7 @@ import code.api.util.ApiRole.CanCreateEntitlementAtAnyBank
 import code.api.util.ErrorMessages.MandatoryPropertyIsNotSet
 import code.api.util._
 import code.api.util.migration.Migration
+import code.api.util.CommonsEmailWrapper
 import code.api.util.migration.Migration.DbFunction
 import code.apicollection.ApiCollection
 import code.apicollectionendpoint.ApiCollectionEndpoint
@@ -151,7 +152,6 @@ import org.apache.commons.io.FileUtils
 import java.io.{File, FileInputStream}
 import java.util.stream.Collectors
 import java.util.{Locale, TimeZone}
-import javax.mail.internet.MimeMessage
 import scala.concurrent.ExecutionContext
 
 /**
@@ -693,10 +693,6 @@ class Boot extends MdcLoggable {
       case e: ExceptionInInitializerError => logger.warn(s"BankAccountCreationListener Exception: $e")
     }
 
-    Mailer.devModeSend.default.set( (m : MimeMessage) => {
-      logger.info("Would have sent email if not in dev mode: " + m.getContent)
-    })
-    
     LiftRules.exceptionHandler.prepend{
       case(_, r, e) if e.isInstanceOf[NullPointerException] && e.getMessage.contains("Looking for Connection Identifier") => {
         logger.error(s"Exception being returned to browser when processing url is ${r.request.uri}, method is ${r.request.method}, exception detail is $e", e)
@@ -880,7 +876,7 @@ class Boot extends MdcLoggable {
   }
 
   private def sendExceptionEmail(exception: Throwable): Unit = {
-    import Mailer.{From, PlainMailBodyType, Subject, To}
+    
     import net.liftweb.util.Helpers.now
 
     val outputStream = new java.io.ByteArrayOutputStream
@@ -899,18 +895,18 @@ class Boot extends MdcLoggable {
 
       //technically doesn't work for all valid email addresses so this will mess up if someone tries to send emails to "foo,bar"@example.com
       val to = toAddressesString.split(",").toList
-      val toParams = to.map(To(_))
-      val params = PlainMailBodyType(error) :: toParams
-
-      //this is an async call
-      Mailer.sendMail(
-        From(from),
-        Subject(s"you got an exception on $host"),
-        params :_*
+
+      val emailContent = CommonsEmailWrapper.EmailContent(
+        from = from,
+        to = to,
+        subject = s"you got an exception on $host",
+        textContent = Some(error)
       )
+
+      //this is an async call∆∆
+      CommonsEmailWrapper.sendTextEmail(emailContent)
     }
 
-    //if Mailer.sendMail wasn't called (note: this actually isn't checking if the mail failed to send as that is being done asynchronously)
     if(mailSent.isEmpty)
       logger.warn(s"Exception notification failed: $mailSent")
   }