feat(account): frontend domain config for email

noah-platform · Feb 15, 2025 · 53e8a36 · 53e8a36
1 parent 14e683d
commit 53e8a36
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/account/server/core/service/register_account.go b/account/server/core/service/register_account.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/rand"
+	"net/url"
 
 	"github.com/lucsky/cuid"
 	"github.com/pkg/errors"
@@ -77,10 +78,17 @@ func (s *Service) RegisterAccount(ctx context.Context, traceID, email, name, pas
 		}
 	}
 
+	verificationURL, err := url.JoinPath(s.config.FrontendBaseUrl, "verify-email", token)
+	if err != nil {
+		l.Error().Err(err).Msg("[Service.RegisterAccount] failed to join verification URL")
+
+		return errors.Wrap(err, "failed to join verification URL")
+	}
+
 	var body bytes.Buffer
 	if err = emailVerificationTemplate.Execute(&body, EmailVerificationTemplateData{
 		Name:            name,
-		VerificationURL: "https://noah.example.com/verify/" + token,
+		VerificationURL: verificationURL,
 	}); err != nil {
 		l.Error().Err(err).Msg("[Service.RegisterAccount] failed to execute email verification template")
 

diff --git a/account/server/core/service/request_password_reset.go b/account/server/core/service/request_password_reset.go
@@ -3,6 +3,7 @@ package service
 import (
 	"bytes"
 	"context"
+	"net/url"
 	"time"
 
 	"github.com/noah-platform/noah/account/server/core"
@@ -48,10 +49,17 @@ func (s *Service) RequestPasswordReset(ctx context.Context, traceID, email strin
 		return errors.Wrap(err, "failed to create password reset token")
 	}
 
+	passwordResetURL, err := url.JoinPath(s.config.FrontendBaseUrl, "forget-password", token)
+	if err != nil {
+		l.Error().Err(err).Msg("[Service.RegisterAccount] failed to join password reset URL")
+
+		return errors.Wrap(err, "failed to join password reset URL")
+	}
+
 	var body bytes.Buffer
 	if err = emailPasswordResetTemplate.Execute(&body, EmailPasswordResetTemplateData{
 		Name:             account.Name,
-		PasswordResetURL: "https://noah.example.com/reset-password/" + token,
+		PasswordResetURL: passwordResetURL,
 	}); err != nil {
 		l.Error().Err(err).Msg("[Service.RegisterAccount] failed to execute email password reset template")
 

diff --git a/account/server/core/service/service.go b/account/server/core/service/service.go
@@ -9,7 +9,8 @@ type Service struct {
 }
 
 type Config struct {
-	EmailFrom string
+	EmailFrom       string
+	FrontendBaseUrl string
 }
 
 type Dependencies struct {

diff --git a/account/server/main.go b/account/server/main.go
@@ -11,10 +11,11 @@ import (
 type Config struct {
 	Environment string `env:"APP_ENV,required"`
 
-	Port         string   `env:"PORT,required"`
-	JWTSecret    string   `env:"JWT_SECRET,required"`
-	DatabaseUrl  string   `env:"DATABASE_URL,required"`
-	KafkaBrokers []string `env:"KAFKA_BROKERS,required"`
+	Port            string   `env:"PORT,required"`
+	JWTSecret       string   `env:"JWT_SECRET,required"`
+	DatabaseUrl     string   `env:"DATABASE_URL,required"`
+	KafkaBrokers    []string `env:"KAFKA_BROKERS,required"`
+	FrontendBaseUrl string   `env:"FRONTEND_BASE_URL,required"`
 
 	EmailFrom       string `env:"EMAIL_FROM,required"`
 	EmailKafkaTopic string `env:"EMAIL_KAFKA_TOPIC,required"`
@@ -38,7 +39,8 @@ func main() {
 			JWTSecret: cfg.JWTSecret,
 		},
 		ServiceConfig: di.ServiceConfig{
-			EmailFrom: cfg.EmailFrom,
+			EmailFrom:       cfg.EmailFrom,
+			FrontendBaseUrl: cfg.FrontendBaseUrl,
 		},
 		PostgresConfig: di.PostgresConfig{
 			DatabaseUrl: cfg.DatabaseUrl,