Merge pull request #96 from authorizerdev/fix/smtp-send-mail

fix: send mail from param

server/constants/constants.go

@@ -11,8 +11,9 @@ var (
 	DATABASE_NAME                = ""
 	SMTP_HOST                    = ""
 	SMTP_PORT                    = ""
+	SMTP_USERNAME                = ""
+	SMTP_PASSWORD                = ""
 	SENDER_EMAIL                 = ""
-	SENDER_PASSWORD              = ""
 	JWT_TYPE                     = ""
 	JWT_SECRET                   = ""
 	ALLOWED_ORIGINS              = []string{}
@@ -26,6 +27,7 @@ var (
 	DISABLE_EMAIL_VERIFICATION   = false
 	DISABLE_BASIC_AUTHENTICATION = false
 	DISABLE_MAGIC_LINK_LOGIN     = false
+	DISABLE_LOGIN_PAGE           = false
 
 	// ROLES
 	ROLES           = []string{}

server/email/email.go

@@ -27,19 +27,18 @@ type Sender struct {
 }
 
 func NewSender() Sender {
-	return Sender{User: constants.SENDER_EMAIL, Password: constants.SENDER_PASSWORD}
+	return Sender{User: constants.SMTP_USERNAME, Password: constants.SMTP_PASSWORD}
 }
 
 func (sender Sender) SendMail(Dest []string, Subject, bodyMessage string) error {
-	msg := "From: " + sender.User + "\n" +
+	msg := "From: " + constants.SENDER_EMAIL + "\n" +
 		"To: " + strings.Join(Dest, ",") + "\n" +
 		"Subject: " + Subject + "\n" + bodyMessage
 
 	err := smtp.SendMail(constants.SMTP_HOST+":"+constants.SMTP_PORT,
 		smtp.PlainAuth("", sender.User, sender.Password, constants.SMTP_HOST),
-		sender.User, Dest, []byte(msg))
+		constants.SENDER_EMAIL, Dest, []byte(msg))
 	if err != nil {
-
 		log.Printf("smtp error: %s", err)
 		return err
 	}

server/env/env.go

@@ -94,12 +94,16 @@ func InitEnv() {
 		constants.SMTP_PORT = os.Getenv("SMTP_PORT")
 	}
 
-	if constants.SENDER_EMAIL == "" {
-		constants.SENDER_EMAIL = os.Getenv("SENDER_EMAIL")
+	if constants.SMTP_USERNAME == "" {
+		constants.SMTP_USERNAME = os.Getenv("SMTP_USERNAME")
 	}
 
-	if constants.SENDER_PASSWORD == "" {
-		constants.SENDER_PASSWORD = os.Getenv("SENDER_PASSWORD")
+	if constants.SMTP_PASSWORD == "" {
+		constants.SMTP_PASSWORD = os.Getenv("SMTP_PASSWORD")
+	}
+
+	if constants.SENDER_EMAIL == "" {
+		constants.SENDER_EMAIL = os.Getenv("SENDER_EMAIL")
 	}
 
 	if constants.JWT_SECRET == "" {
@@ -172,8 +176,9 @@ func InitEnv() {
 	constants.DISABLE_BASIC_AUTHENTICATION = os.Getenv("DISABLE_BASIC_AUTHENTICATION") == "true"
 	constants.DISABLE_EMAIL_VERIFICATION = os.Getenv("DISABLE_EMAIL_VERIFICATION") == "true"
 	constants.DISABLE_MAGIC_LINK_LOGIN = os.Getenv("DISABLE_MAGIC_LINK_LOGIN") == "true"
+	constants.DISABLE_LOGIN_PAGE = os.Getenv("DISABLE_LOGIN_PAGE") == "true"
 
-	if constants.SMTP_HOST == "" || constants.SENDER_EMAIL == "" || constants.SENDER_PASSWORD == "" {
+	if constants.SMTP_HOST == "" || constants.SMTP_USERNAME == "" || constants.SMTP_PASSWORD == "" || constants.SENDER_EMAIL == "" {
 		constants.DISABLE_EMAIL_VERIFICATION = true
 		constants.DISABLE_MAGIC_LINK_LOGIN = true
 	}

server/main.go

@@ -32,8 +32,9 @@ func main() {
 
 	router := router.InitRouter()
 
-	// login wall app related routes.
+	// login page app related routes.
 	// if we put them in router file then tests would fail as templates or build path will be different
+	if !constants.DISABLE_LOGIN_PAGE {
 		router.LoadHTMLGlob("templates/*")
 		app := router.Group("/app")
 		{
@@ -41,5 +42,7 @@ func main() {
 			app.GET("/", handlers.AppHandler())
 			app.GET("/reset-password", handlers.AppHandler())
 		}
+	}
+
 	router.Run(":" + constants.PORT)
 }