llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-02 03:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let SendEmail() return string.

Browse Source
This commit is contained in:
Yang Luo
2021-05-29 15:25:41 +08:00
parent 0f8a46fe0b
commit 215b96c881
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
object/email.go
View File

@ -18,7 +18,7 @@ package object
import "github.com/go-gomail/gomail" import "github.com/go-gomail/gomail"
func SendEmail(provider *Provider, title, content, dest, sender string) (string, error) { func SendEmail(provider *Provider, title, content, dest, sender string) string {
dialer := gomail.NewDialer(provider.Host, provider.Port, provider.ClientId, provider.ClientSecret) dialer := gomail.NewDialer(provider.Host, provider.Port, provider.ClientId, provider.ClientSecret)
message := gomail.NewMessage() message := gomail.NewMessage()
@ -27,5 +27,10 @@ func SendEmail(provider *Provider, title, content, dest, sender string) (string,
message.SetHeader("Subject", title) message.SetHeader("Subject", title)
message.SetBody("text/html", content) message.SetBody("text/html", content)
return "", dialer.DialAndSend(message) err := dialer.DialAndSend(message)
if err == nil {
return ""
} else {
return err.Error()
}
} }

10
object/verification.go
View File

@ -54,15 +54,7 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide
return result return result
} }
msg, err := SendEmail(provider, title, content, dest, sender) return SendEmail(provider, title, content, dest, sender)
if msg != "" {
return msg
}
if err != nil {
panic(err)
}
return ""
} }
func SendVerificationCodeToPhone(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string) string { func SendVerificationCodeToPhone(organization *Organization, user *User, provider *Provider, remoteAddr string, dest string) string {