diff --git a/fs_template/get_reset_password_html.tpl b/fs_template/get_reset_password_html.tpl
index f5063ed4..613b0586 100644
--- a/fs_template/get_reset_password_html.tpl
+++ b/fs_template/get_reset_password_html.tpl
@@ -1,3 +1,5 @@
+Subject: Password Reset Request for Your {{ .CompanyName }} Account
+
Dear {{ .UserName }},
We have received your request to reset the password for your {{ .CompanyName }} account.
diff --git a/server/auth/internal/handler/routes.go b/server/auth/internal/handler/routes.go
index 19bbc47d..d3582a1e 100644
--- a/server/auth/internal/handler/routes.go
+++ b/server/auth/internal/handler/routes.go
@@ -53,7 +53,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Handler: UserResetPasswordHandler(serverCtx),
},
{
- Method: http.MethodPost,
+ Method: http.MethodGet,
Path: "/api/auth/reset/password/html",
Handler: UserResetPasswordHtmlHandler(serverCtx),
},
diff --git a/server/auth/internal/logic/email_manager.go b/server/auth/internal/logic/email_manager.go
index 8931ef6a..47268c8e 100644
--- a/server/auth/internal/logic/email_manager.go
+++ b/server/auth/internal/logic/email_manager.go
@@ -179,7 +179,6 @@ func (m *EmailSender) Resend(uniqueKey string, content []byte) {
m.lock.Lock()
defer m.lock.Unlock()
-
// Check if the email task still exists and has not been sent successfully
if task, ok := m.emailSending[uniqueKey]; ok && task.SendTime.Add(m.ResendTimeLimit).After(time.Now().UTC()) {
err := smtp.SendMail(task.Email.TargetEmail, m.Auth, m.FromEmail, []string{task.Email.TargetEmail}, content)
diff --git a/server/auth/internal/types/types.go b/server/auth/internal/types/types.go
index 9049c609..2a76ca78 100644
--- a/server/auth/internal/types/types.go
+++ b/server/auth/internal/types/types.go
@@ -37,7 +37,7 @@ type DataResetToken struct {
}
type RequestUserResetHtml struct {
- ResetToken string `json:"reset_token"`
+ ResetToken string `form:"reset_token"`
}
type RequestUserResetPassword struct {
diff --git a/server_api/auth.api b/server_api/auth.api
index 9ddb3c27..514d1b61 100644
--- a/server_api/auth.api
+++ b/server_api/auth.api
@@ -38,7 +38,7 @@ service auth {
// 获取重定向到html页面
@handler UserResetPasswordHtmlHandler
- post /api/auth/reset/password/html(RequestUserResetHtml) returns (response);
+ get /api/auth/reset/password/html(RequestUserResetHtml) returns (response);
@handler DebugAuthDeleteHandler
post /api/auth/debug/delete(RequestAuthDelete) returns (response);
@@ -96,7 +96,7 @@ type (
// RequestUserResetPassword 重置密码
RequestUserResetHtml {
- ResetToken string `json:"reset_token"`
+ ResetToken string `form:"reset_token"`
}
// RequestUserResetPassword 重置密码