From 3d349a709c7513cba1c7b04c1031c1b8c5040938 Mon Sep 17 00:00:00 2001 From: Alex <$(pass /github/email)> Date: Mon, 3 Mar 2025 14:00:31 +0100 Subject: [PATCH] add frontend_path --- go-backend/configs/config.template.json | 1 + go-backend/internal/config/config.go | 1 + go-backend/internal/services/email_service.go | 22 ++++++++++--------- .../templates/email/mail_change_password.tmpl | 4 ++-- .../email/mail_change_password.txt.tmpl | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/go-backend/configs/config.template.json b/go-backend/configs/config.template.json index 3a7a7b2..c54e244 100644 --- a/go-backend/configs/config.template.json +++ b/go-backend/configs/config.template.json @@ -2,6 +2,7 @@ "site": { "WebsiteTitle": "My Carsharing Site", "BaseUrl": "https://domain.de", + "FrontendPath": "", "AllowOrigins": "https://domain.de" }, "Environment": "dev", diff --git a/go-backend/internal/config/config.go b/go-backend/internal/config/config.go index 4147684..438884e 100644 --- a/go-backend/internal/config/config.go +++ b/go-backend/internal/config/config.go @@ -27,6 +27,7 @@ type SiteConfig struct { AllowOrigins string `json:"AllowOrigins" envconfig:"ALLOW_ORIGINS"` WebsiteTitle string `json:"WebsiteTitle" envconfig:"WEBSITE_TITLE"` BaseURL string `json:"BaseUrl" envconfig:"BASE_URL"` + FrontendPath string `json:"FrontendPath" envconfig:"FRONTEND_PATH"` } type AuthenticationConfig struct { JWTSecret string diff --git a/go-backend/internal/services/email_service.go b/go-backend/internal/services/email_service.go index 98d2d93..d4e8999 100644 --- a/go-backend/internal/services/email_service.go +++ b/go-backend/internal/services/email_service.go @@ -91,17 +91,19 @@ func (s *EmailService) SendVerificationEmail(user *models.User, token *string) e func (s *EmailService) SendChangePasswordEmail(user *models.User, token *string) error { // Prepare data to be injected into the template data := struct { - FirstName string - LastName string - Token string - BASEURL string - UserID uint + FirstName string + LastName string + Token string + BASEURL string + FRONTEND_PATH string + UserID uint }{ - FirstName: user.FirstName, - LastName: user.LastName, - Token: *token, - BASEURL: config.Site.BaseURL, - UserID: user.ID, + FirstName: user.FirstName, + LastName: user.LastName, + Token: *token, + FRONTEND_PATH: config.Site.FrontendPath, + BASEURL: config.Site.BaseURL, + UserID: user.ID, } subject := constants.MailChangePasswordSubject diff --git a/go-backend/templates/email/mail_change_password.tmpl b/go-backend/templates/email/mail_change_password.tmpl index c05667a..eb15566 100644 --- a/go-backend/templates/email/mail_change_password.tmpl +++ b/go-backend/templates/email/mail_change_password.tmpl @@ -69,7 +69,7 @@
- {{.BASEURL}}/backend/auth/password/change/{{.UserID}}?token={{.Token}} + {{.BASEURL}}{{.FRONTEND_PATH}}/auth/password/change/{{.UserID}}?token={{.Token}}
Mit Freundlichen Grüßen, diff --git a/go-backend/templates/email/mail_change_password.txt.tmpl b/go-backend/templates/email/mail_change_password.txt.tmpl index 884c7d6..34253e6 100644 --- a/go-backend/templates/email/mail_change_password.txt.tmpl +++ b/go-backend/templates/email/mail_change_password.txt.tmpl @@ -6,7 +6,7 @@ dies nicht angefordert haben, ignoriere diese E-Mail einfach. Ansonsten kannst Du Dein Passwort jetzt ändern, indem Du hier auf den Link klickst: Passwort ändern: -{{.BASEURL}}/backend/auth/password/change/{{.UserID}}?token={{.Token}} +{{.BASEURL}}{{.FRONTEND_PATH}}/auth/password/change/{{.UserID}}?token={{.Token}} Mit Freundlichen Grüßen,