Upgrade v1.8.2 (#23)

goravel · Feb 1, 2023 · c2855d6 · c2855d6
1 parent c35b23f
commit c2855d6
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 8 deletions.
diff --git a/database/orm.go b/database/orm.go
@@ -23,11 +23,14 @@ type Orm struct {
 func NewOrm(ctx context.Context) *Orm {
 	defaultConnection := facades.Config.GetString("database.default")
 	gormDB, err := databasegorm.NewDB(ctx, defaultConnection)
-	if err != nil || gormDB == nil {
+	if err != nil {
 		color.Redln(fmt.Sprintf("[Orm] Init %s connection error: %v", defaultConnection, err))
 
 		return nil
 	}
+	if gormDB == nil {
+		return nil
+	}
 
 	return &Orm{
 		ctx:      ctx,

diff --git a/log/logrus_writer.go b/log/logrus_writer.go
@@ -3,11 +3,11 @@ package log
 import (
 	"errors"
 
+	"github.com/sirupsen/logrus"
+
 	"github.com/goravel/framework/contracts/log"
 	"github.com/goravel/framework/facades"
 	"github.com/goravel/framework/log/logger"
-
-	"github.com/sirupsen/logrus"
 )
 
 type Writer struct {

diff --git a/mail/application.go b/mail/application.go
@@ -123,10 +123,20 @@ func SendMail(subject, html string, fromAddress, fromName string, to, cc, bcc, a
 		}
 	}
 
-	return e.SendWithStartTLS(fmt.Sprintf("%s:%s", facades.Config.GetString("mail.host"),
-		facades.Config.GetString("mail.port")),
-		LoginAuth(facades.Config.GetString("mail.username"),
-			facades.Config.GetString("mail.password")), &tls.Config{ServerName: facades.Config.GetString("mail.host")})
+	port := facades.Config.GetInt("mail.port")
+	switch port {
+	case 465:
+		return e.SendWithTLS(fmt.Sprintf("%s:%s", facades.Config.GetString("mail.host"), facades.Config.GetString("mail.port")),
+			LoginAuth(facades.Config.GetString("mail.username"), facades.Config.GetString("mail.password")),
+			&tls.Config{ServerName: facades.Config.GetString("mail.host")})
+	case 587:
+		return e.SendWithStartTLS(fmt.Sprintf("%s:%s", facades.Config.GetString("mail.host"), facades.Config.GetString("mail.port")),
+			LoginAuth(facades.Config.GetString("mail.username"), facades.Config.GetString("mail.password")),
+			&tls.Config{ServerName: facades.Config.GetString("mail.host")})
+	default:
+		return e.Send(fmt.Sprintf("%s:%d", facades.Config.GetString("mail.host"), port),
+			LoginAuth(facades.Config.GetString("mail.username"), facades.Config.GetString("mail.password")))
+	}
 }
 
 type loginAuth struct {

diff --git a/mail/application_test.go b/mail/application_test.go
@@ -48,7 +48,45 @@ func (s *ApplicationTestSuite) SetupTest() {
 
 }
 
-func (s *ApplicationTestSuite) TestSendMail() {
+func (s *ApplicationTestSuite) TestSendMailBy25Port() {
+	facades.Config.Add("mail", map[string]any{
+		"host": facades.Config.Env("MAIL_HOST", ""),
+		"port": 25,
+		"from": map[string]any{
+			"address": facades.Config.Env("MAIL_FROM_ADDRESS", "[email protected]"),
+			"name":    facades.Config.Env("MAIL_FROM_NAME", "Example"),
+		},
+		"username": facades.Config.Env("MAIL_USERNAME"),
+		"password": facades.Config.Env("MAIL_PASSWORD"),
+	})
+	s.Nil(facades.Mail.To([]string{facades.Config.Env("MAIL_TO").(string)}).
+		Cc([]string{facades.Config.Env("MAIL_CC").(string)}).
+		Bcc([]string{facades.Config.Env("MAIL_BCC").(string)}).
+		Attach([]string{"../logo.png"}).
+		Content(mail.Content{Subject: "Goravel Test", Html: "<h1>Hello Goravel</h1>"}).
+		Send())
+}
+
+func (s *ApplicationTestSuite) TestSendMailBy465Port() {
+	facades.Config.Add("mail", map[string]any{
+		"host": facades.Config.Env("MAIL_HOST", ""),
+		"port": 465,
+		"from": map[string]any{
+			"address": facades.Config.Env("MAIL_FROM_ADDRESS", "[email protected]"),
+			"name":    facades.Config.Env("MAIL_FROM_NAME", "Example"),
+		},
+		"username": facades.Config.Env("MAIL_USERNAME"),
+		"password": facades.Config.Env("MAIL_PASSWORD"),
+	})
+	s.Nil(facades.Mail.To([]string{facades.Config.Env("MAIL_TO").(string)}).
+		Cc([]string{facades.Config.Env("MAIL_CC").(string)}).
+		Bcc([]string{facades.Config.Env("MAIL_BCC").(string)}).
+		Attach([]string{"../logo.png"}).
+		Content(mail.Content{Subject: "Goravel Test", Html: "<h1>Hello Goravel</h1>"}).
+		Send())
+}
+
+func (s *ApplicationTestSuite) TestSendMailBy587Port() {
 	s.Nil(facades.Mail.To([]string{facades.Config.Env("MAIL_TO").(string)}).
 		Cc([]string{facades.Config.Env("MAIL_CC").(string)}).
 		Bcc([]string{facades.Config.Env("MAIL_BCC").(string)}).