Compare commits
3 Commits
8ec9fb247f
...
8d56a9ad48
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d56a9ad48 | ||
|
|
3d349a709c | ||
|
|
d1d5d839ae |
@@ -75,7 +75,7 @@ export default {
|
||||
user_not_found_or_wrong_password: 'Existiert nicht oder falsches Passwort',
|
||||
email_already_registered: 'Ein Mitglied wurde schon mit dieser Emailadresse erstellt.',
|
||||
password_already_changed: 'Das Passwort wurde schon geändert.',
|
||||
insecure: 'unsicheres Passwort, versuchen Sie {message}',
|
||||
insecure: 'Unsicheres Passwort, versuchen Sie {message}',
|
||||
longer: 'oder verwenden Sie ein längeres Passwort',
|
||||
special: 'mehr Sonderzeichen einzufügen',
|
||||
lowercase: 'Kleinbuchstaben zu verwenden',
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"site": {
|
||||
"WebsiteTitle": "My Carsharing Site",
|
||||
"BaseUrl": "https://domain.de",
|
||||
"FrontendPath": "",
|
||||
"AllowOrigins": "https://domain.de"
|
||||
},
|
||||
"Environment": "dev",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -14,7 +14,7 @@ func SetupValidators() {
|
||||
v.RegisterValidation("safe_content", ValidateSafeContent)
|
||||
|
||||
// Register struct-level validations
|
||||
v.RegisterStructValidation(validateUser, models.User{})
|
||||
v.RegisterStructValidation(ValidateUser, models.User{})
|
||||
v.RegisterStructValidation(ValidateSubscription, models.SubscriptionModel{})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
</div>
|
||||
<div style="text-align: center; padding: 16px 24px 16px 24px">
|
||||
<a
|
||||
href=" {{.BASEURL}}/backend/auth/password/change/{{.UserID}}?token={{.Token}}"
|
||||
href=" {{.BASEURL}}{{.FRONTEND_PATH}}/auth/password/change/{{.UserID}}?token={{.Token}}"
|
||||
style="
|
||||
color: #ffffff;
|
||||
font-size: 26px;
|
||||
@@ -123,7 +123,7 @@
|
||||
padding: 4px 24px 16px 24px;
|
||||
"
|
||||
>
|
||||
{{.BASEURL}}/backend/auth/password/change/{{.UserID}}?token={{.Token}}
|
||||
{{.BASEURL}}{{.FRONTEND_PATH}}/auth/password/change/{{.UserID}}?token={{.Token}}
|
||||
</div>
|
||||
<div style="font-weight: normal; padding: 16px 24px 16px 24px">
|
||||
Mit Freundlichen Grüßen,
|
||||
|
||||
@@ -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,
|
||||
|
||||
|
||||
Reference in New Issue
Block a user