From 94743246a13da71325fe6865abf46079409419b5 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Mon, 25 Mar 2024 21:26:36 +0800 Subject: [PATCH] Improve "%{user.friendlyName}" handling --- controllers/service.go | 4 +++- object/verification.go | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/controllers/service.go b/controllers/service.go index b3a81fa1..23ddad5f 100644 --- a/controllers/service.go +++ b/controllers/service.go @@ -125,9 +125,11 @@ func (c *ApiController) SendEmail() { return } + var userString = "Hi" if user != nil { - content = strings.Replace(content, "%{user.friendlyName}", user.GetFriendlyName(), 1) + userString = user.GetFriendlyName() } + content = strings.Replace(content, "%{user.friendlyName}", userString, 1) } } diff --git a/object/verification.go b/object/verification.go index 83757cb1..c0f0e832 100644 --- a/object/verification.go +++ b/object/verification.go @@ -92,9 +92,12 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide // "You have requested a verification code at Casdoor. Here is your code: %s, please enter in 5 minutes." content := strings.Replace(provider.Content, "%s", code, 1) + + var userString = "Hi" if user != nil { - content = strings.Replace(content, "%{user.friendlyName}", user.GetFriendlyName(), 1) + userString = user.GetFriendlyName() } + content = strings.Replace(content, "%{user.friendlyName}", userString, 1) err := IsAllowSend(user, remoteAddr, provider.Category) if err != nil {