pass caller URL in mail body

quantonganh · Jan 3, 2024 · 8094df4 · 8094df4
1 parent 3b734d6
commit 8094df4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/http/newsletter.go b/http/newsletter.go
@@ -26,6 +26,7 @@ const (
 func (s *Server) subscribeHandler(w http.ResponseWriter, r *http.Request) error {
 	email := r.FormValue("email")
 	subsReq := map[string]string{
+		"url":   s.URL(),
 		"email": email,
 	}
 	req, err := json.Marshal(subsReq)

diff --git a/http/server.go b/http/server.go
@@ -127,7 +127,7 @@ func (s *Server) Scheme() string {
 
 // UseTLS checks if server use TLS or not
 func (s *Server) UseTLS() bool {
-	return s.Domain != ""
+	return s.Domain != "localhost"
 }
 
 // Port returns server port
@@ -147,7 +147,11 @@ func (s *Server) URL() string {
 		domain = s.Domain
 	}
 
-	if port == 80 || port == 443 || flag.Lookup("test.v") != nil {
+	if flag.Lookup("test.v") != nil {
+		return fmt.Sprintf("http://%s", domain)
+	}
+
+	if port == 80 || port == 443 {
 		return fmt.Sprintf("%s://%s", scheme, domain)
 	}
 	return fmt.Sprintf("%s://%s:%d", scheme, domain, s.Port())