MailService getDefaultMailFrom() #10475

modules/core/core-api/src/main/java/com/enonic/xp/mail/MailService.java

@@ -9,4 +9,6 @@ public interface MailService
     void send( MailMessage message );
 
     void send( SendMailParams message );
+
+    String getDefaultFromEmail();
 }

modules/core/core-mail/src/main/java/com/enonic/xp/mail/impl/MailServiceImpl.java

@@ -114,6 +114,12 @@ public void send( final SendMailParams params )
         }
     }
 
+    @Override
+    public String getDefaultFromEmail()
+    {
+        return defaultFromEmail;
+    }
+
     private MimeMessage newMessage()
     {
         return new MimeMessage( this.session );

modules/core/core-mail/src/test/java/com/enonic/xp/mail/impl/MailServiceImplTest.java

@@ -9,7 +9,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.jvnet.mock_javamail.Mailbox;
-import org.mockito.Mockito;
 
 import com.enonic.xp.mail.MailException;
 import com.enonic.xp.mail.MailMessage;
@@ -18,6 +17,8 @@
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class MailServiceImplTest
 {
@@ -27,7 +28,8 @@ public class MailServiceImplTest
     public void setUp()
         throws Exception
     {
-        final MailConfig config = Mockito.mock( MailConfig.class, invocation -> invocation.getMethod().getDefaultValue() );
+        final MailConfig config = mock( MailConfig.class, invocation -> invocation.getMethod().getDefaultValue() );
+        when( config.defaultFromEmail() ).thenReturn( "noreply@domain.com" );
 
         this.mailService = new MailServiceImpl();
         this.mailService.activate( config );
@@ -68,6 +70,12 @@ public void testSend()
             SendMailParams.create().subject( "test subject" ).body( "test body" ).to( "to@bar.com" ).from( "from@bar.com" ).build() ) );
     }
 
+    @Test
+    public void testGetDefaultFromEmail()
+    {
+        assertEquals( "noreply@domain.com", this.mailService.getDefaultFromEmail() );
+    }
+
     private void createMockMessage( MimeMessage msg )
         throws Exception
     {

modules/lib/lib-mail/src/main/java/com/enonic/xp/lib/mail/GetDefaultFromEmailHandler.java

@@ -0,0 +1,25 @@
+package com.enonic.xp.lib.mail;
+
+import java.util.function.Supplier;
+
+import com.enonic.xp.mail.MailService;
+import com.enonic.xp.script.bean.BeanContext;
+import com.enonic.xp.script.bean.ScriptBean;
+
+public class GetDefaultFromEmailHandler
+    implements ScriptBean
+{
+
+    private Supplier<MailService> mailService;
+
+    @Override
+    public void initialize( final BeanContext context )
+    {
+        this.mailService = context.getService( MailService.class );
+    }
+
+    public String execute()
+    {
+        return this.mailService.get().getDefaultFromEmail();
+    }
+}

modules/lib/lib-mail/src/main/resources/lib/xp/examples/mail/getDefaultFromEmail.js

@@ -0,0 +1,9 @@
+var mailLib = require('/lib/xp/mail.js');
+var assert = require('/lib/xp/testing.js');
+
+// BEGIN
+// Retrieve the default from mail address.
+var defaultFromEmail = mailLib.getDefaultFromEmail();
+// END
+
+assert.assertEquals('noreply@domain.com', defaultFromEmail);

modules/lib/lib-mail/src/main/resources/lib/xp/mail.ts

@@ -131,3 +131,18 @@ export function send(params: SendMessageParams): boolean {
 
     return bean.send();
 }
+
+
+interface GetDefaultFromEmailHandler {
+    execute(): string | null;
+}
+
+/**
+ * This function returns defaultFromMail.
+ *
+ * @returns {string} The default from e-mail address, or null if not set.
+ */
+export function getDefaultFromEmail(): string | null {
+    const bean = __.newBean<GetDefaultFromEmailHandler>('com.enonic.xp.lib.mail.GetDefaultFromEmailHandler');
+    return bean.execute();
+}

modules/lib/lib-mail/src/test/java/com/enonic/xp/lib/mail/SendMailScriptTest.java

@@ -45,6 +45,12 @@ public void send( final SendMailParams message )
             {
                 SendMailScriptTest.this.actualMessage = message;
             }
+
+            @Override
+            public String getDefaultFromEmail()
+            {
+                return "noreply@domain.com";
+            }
         } );
     }
 
@@ -54,6 +60,12 @@ public void testExample()
         runScript( "/lib/xp/examples/mail/send.js" );
     }
 
+    @Test
+    public void testGetDefaultFromEmail()
+    {
+        runScript( "/lib/xp/examples/mail/getDefaultFromEmail.js" );
+    }
+
     @Test
     public void testSimpleMail()
     {
@@ -119,6 +131,12 @@ public void send( final SendMailParams message )
             {
                 throw new RuntimeException( "Error sending mail" );
             }
+
+            @Override
+            public String getDefaultFromEmail()
+            {
+                return null;
+            }
         };
         addService( MailService.class, mailService );
 
@@ -159,6 +177,12 @@ public void send( final SendMailParams message )
             {
                 throw new RuntimeException( "Error sending mail" );
             }
+
+            @Override
+            public String getDefaultFromEmail()
+            {
+                return null;
+            }
         };
         addService( MailService.class, mailService );
 
@@ -192,6 +216,12 @@ public void send( final SendMailParams message )
             {
                 throw new RuntimeException( "Error sending mail" );
             }
+
+            @Override
+            public String getDefaultFromEmail()
+            {
+                return null;
+            }
         } );
 
         try