Net 1227 v1 (#3063)

* generalise smtp config * copy over smtp vars * env new line * fix master key api access * comment user tests * fix network and user invite for master key access * remove email sender type
gravitl · Aug 22, 2024 · 1924da2 · 1924da2
1 parent fe57a6a
commit 1924da2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 90 deletions.
diff --git a/config/config.go b/config/config.go
@@ -95,8 +95,8 @@ type ServerConfig struct {
 	EndpointDetection          bool          `json:"endpoint_detection"`
 	AllowedEmailDomains        string        `yaml:"allowed_email_domains"`
 	EmailSenderAddr            string        `json:"email_sender_addr"`
-	EmailSenderAuth            string        `json:"email_sender_auth"`
-	EmailSenderType            string        `json:"email_sender_type"`
+	EmailSenderUser            string        `json:"email_sender_user"`
+	EmailSenderPassword        string        `json:"email_sender_password"`
 	SmtpHost                   string        `json:"smtp_host"`
 	SmtpPort                   int           `json:"smtp_port"`
 	MetricInterval             string        `yaml:"metric_interval"`

diff --git a/pro/email/email.go b/pro/email/email.go
@@ -16,24 +16,19 @@ const (
 )
 
 func init() {
-	switch EmailSenderType(servercfg.EmailSenderType()) {
-	case Smtp:
-		smtpSender := &SmtpSender{
-			SmtpHost:    servercfg.GetSmtpHost(),
-			SmtpPort:    servercfg.GetSmtpPort(),
-			SenderEmail: servercfg.GetSenderEmail(),
-			SendUser:    servercfg.GetSenderUser(),
-			SenderPass:  servercfg.GetEmaiSenderAuth(),
-		}
-		if smtpSender.SendUser == "" {
-			smtpSender.SendUser = smtpSender.SenderEmail
-		}
-		client = smtpSender
-
-	case Resend:
-		client = NewResendEmailSenderFromConfig()
+
+	smtpSender := &SmtpSender{
+		SmtpHost:    servercfg.GetSmtpHost(),
+		SmtpPort:    servercfg.GetSmtpPort(),
+		SenderEmail: servercfg.GetSenderEmail(),
+		SendUser:    servercfg.GetSenderUser(),
+		SenderPass:  servercfg.GetEmaiSenderPassword(),
+	}
+	if smtpSender.SendUser == "" {
+		smtpSender.SendUser = smtpSender.SenderEmail
 	}
-	client = GetClient()
+	client = smtpSender
+
 }
 
 // EmailSender - an interface for sending emails based on notifications and mail templates

diff --git a/pro/email/resend.go b/pro/email/resend.go
diff --git a/scripts/netmaker.default.env b/scripts/netmaker.default.env
@@ -86,5 +86,4 @@ EMAIL_SENDER_ADDR=
 EMAIL_SENDER_USER=
 # sender smtp password
 EMAIL_SENDER_PASSWORD=
-# mail sender type (smtp or resend)
-EMAIL_SENDER_TYPE=smtp
+
diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
@@ -254,7 +254,7 @@ save_config() { (
 		"CORS_ALLOWED_ORIGIN" "DISPLAY_KEYS" "DATABASE" "SERVER_BROKER_ENDPOINT" "VERBOSITY"
 		"DEBUG_MODE"  "REST_BACKEND" "DISABLE_REMOTE_IP_CHECK" "TELEMETRY" "ALLOWED_EMAIL_DOMAINS" "AUTH_PROVIDER" "CLIENT_ID" "CLIENT_SECRET"
 		"FRONTEND_URL" "AZURE_TENANT" "OIDC_ISSUER" "EXPORTER_API_PORT" "JWT_VALIDITY_DURATION" "RAC_AUTO_DISABLE" "CACHING_ENABLED" "ENDPOINT_DETECTION"
-		"SMTP_HOST" "SMTP_PORT" "EMAIL_SENDER_ADDR" "EMAIL_SENDER_USER" "EMAIL_SENDER_PASSWORD" "EMAIL_SENDER_TYPE")
+		"SMTP_HOST" "SMTP_PORT" "EMAIL_SENDER_ADDR" "EMAIL_SENDER_USER" "EMAIL_SENDER_PASSWORD")
 	for name in "${toCopy[@]}"; do
 		save_config_item $name "${!name}"
 	done

diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go
@@ -279,32 +279,22 @@ func GetSenderUser() string {
 	v := ""
 	if fromEnv := os.Getenv("EMAIL_SENDER_USER"); fromEnv != "" {
 		v = fromEnv
-	} else if fromCfg := config.Config.Server.EmailSenderAddr; fromCfg != "" {
+	} else if fromCfg := config.Config.Server.EmailSenderUser; fromCfg != "" {
 		v = fromCfg
 	}
 	return v
 }
 
-func GetEmaiSenderAuth() string {
+func GetEmaiSenderPassword() string {
 	v := ""
 	if fromEnv := os.Getenv("EMAIL_SENDER_PASSWORD"); fromEnv != "" {
 		v = fromEnv
-	} else if fromCfg := config.Config.Server.EmailSenderAddr; fromCfg != "" {
+	} else if fromCfg := config.Config.Server.EmailSenderPassword; fromCfg != "" {
 		v = fromCfg
 	}
 	return v
 }
 
-func EmailSenderType() string {
-	s := ""
-	if fromEnv := os.Getenv("EMAIL_SENDER_TYPE"); fromEnv != "" {
-		s = fromEnv
-	} else if fromCfg := config.Config.Server.EmailSenderType; fromCfg != "" {
-		s = fromCfg
-	}
-	return s
-}
-
 // GetOwnerEmail - gets the owner email (saas)
 func GetOwnerEmail() string {
 	return os.Getenv("SAAS_OWNER_EMAIL")