fix(smtp): add date header and make enums public (#118)

* fix(smtp): add date header and make enums public
* fix(smtp): add comments for enum helpers

pkg/generators/xouath2/xoauth2.go

@@ -17,9 +17,9 @@ type Generator struct{}
 func (g *Generator) Generate(_ types.Service, props map[string]string, args []string) (types.ServiceConfig, error) {
 
 	if provider, found := props["provider"]; found {
-		 if provider == "gmail" {
-			 return oauth2GeneratorGmail(args[0])
-		 }
+		if provider == "gmail" {
+			return oauth2GeneratorGmail(args[0])
+		}
 	}
 
 	if len(args) > 0 {
@@ -179,11 +179,10 @@ func generateOauth2Config(conf *oauth2.Config, host string) (*smtp.Config, error
 		FromAddress: sender,
 		FromName:    "Shoutrrr",
 		ToAddresses: []string{sender},
-		Auth:        smtp.OAuth2,
+		Auth:        smtp.AuthTypes.OAuth2,
 		UseStartTLS: true,
 		UseHTML:     true,
 	}
 
 	return svcConf, nil
 }
-

pkg/services/smtp/smtp.go

@@ -10,6 +10,7 @@ import (
 	"net"
 	"net/smtp"
 	"net/url"
+	"time"
 
 	"github.com/containrrr/shoutrrr/pkg/services/standard"
 	"github.com/containrrr/shoutrrr/pkg/types"
@@ -37,10 +38,10 @@ func (service *Service) Initialize(configURL *url.URL, logger *log.Logger) error
 		Port:        25,
 		ToAddresses: nil,
 		Subject:     "",
-		Auth:        authTypes.Unknown,
+		Auth:        AuthTypes.Unknown,
 		UseStartTLS: true,
 		UseHTML:     false,
-		Encryption:  encMethods.Auto,
+		Encryption:  EncMethods.Auto,
 	}
 
 	pkr := format.NewPropKeyResolver(service.config)
@@ -49,11 +50,11 @@ func (service *Service) Initialize(configURL *url.URL, logger *log.Logger) error
 		return err
 	}
 
-	if service.config.Auth == authTypes.Unknown {
+	if service.config.Auth == AuthTypes.Unknown {
 		if service.config.Username != "" {
-			service.config.Auth = authTypes.Plain
+			service.config.Auth = AuthTypes.Plain
 		} else {
-			service.config.Auth = authTypes.None
+			service.config.Auth = AuthTypes.None
 		}
 	}
 
@@ -152,13 +153,13 @@ func (service *Service) doSend(client *smtp.Client, message string, config *Conf
 func (service *Service) getAuth(config *Config) (smtp.Auth, failure) {
 
 	switch config.Auth {
-	case authTypes.None:
+	case AuthTypes.None:
 		return nil, nil
-	case authTypes.Plain:
+	case AuthTypes.Plain:
 		return smtp.PlainAuth("", config.Username, config.Password, config.Host), nil
-	case authTypes.CRAMMD5:
+	case AuthTypes.CRAMMD5:
 		return smtp.CRAMMD5Auth(config.Username, config.Password), nil
-	case authTypes.OAuth2:
+	case AuthTypes.OAuth2:
 		return OAuth2Auth(config.Username, config.Password), nil
 	default:
 		return nil, fail(FailAuthType, nil, config.Auth.String())
@@ -216,6 +217,7 @@ func (service *Service) getHeaders(toAddress string, subject string) map[string]
 
 	return map[string]string{
 		"Subject":      subject,
+		"Date":         time.Now().Format(time.RFC1123Z),
 		"To":           toAddress,
 		"From":         fmt.Sprintf("%s <%s>", conf.FromName, conf.FromAddress),
 		"MIME-version": "1.0;",

pkg/services/smtp/smtp_authtype.go

@@ -16,7 +16,8 @@ type authTypeVals struct {
 	Enum    types.EnumFormatter
 }
 
-var authTypes = &authTypeVals{
+// AuthTypes is the enum helper for populating the Auth field
+var AuthTypes = &authTypeVals{
 	None:    0,
 	Plain:   1,
 	CRAMMD5: 2,
@@ -33,11 +34,5 @@ var authTypes = &authTypeVals{
 }
 
 func (at authType) String() string {
-	return authTypes.Enum.Print(int(at))
+	return AuthTypes.Enum.Print(int(at))
 }
-
-func parseAuth(s string) authType {
-	return authType(authTypes.Enum.Parse(s))
-}
-
-var OAuth2 = authTypes.OAuth2

pkg/services/smtp/smtp_config.go

@@ -91,8 +91,8 @@ func (config *Config) Clone() Config {
 // Enums returns the fields that should use a corresponding EnumFormatter to Print/Parse their values
 func (config Config) Enums() map[string]types.EnumFormatter {
 	return map[string]types.EnumFormatter{
-		"Auth":       authTypes.Enum,
-		"Encryption": encMethods.Enum,
+		"Auth":       AuthTypes.Enum,
+		"Encryption": EncMethods.Enum,
 	}
 }
 

pkg/services/smtp/smtp_encmethod.go

@@ -16,7 +16,8 @@ type encMethodVals struct {
 	Enum types.EnumFormatter
 }
 
-var encMethods = &encMethodVals{
+// EncMethods is the enum helper for populating the Encryption field
+var EncMethods = &encMethodVals{
 	None:        0,
 	ExplicitTLS: 1,
 	ImplicitTLS: 2,
@@ -32,18 +33,14 @@ var encMethods = &encMethodVals{
 }
 
 func (at encMethod) String() string {
-	return encMethods.Enum.Print(int(at))
-}
-
-func parseEncryption(s string) encMethod {
-	return encMethod(encMethods.Enum.Parse(s))
+	return EncMethods.Enum.Print(int(at))
 }
 
 func useImplicitTLS(encryption encMethod, port uint16) bool {
 	switch encryption {
-	case encMethods.ImplicitTLS:
+	case EncMethods.ImplicitTLS:
 		return true
-	case encMethods.Auto:
+	case EncMethods.Auto:
 		return port == ImplicitTLSPort
 	default:
 		return false