Fix: retrieve no need user id

pull/119/head
zijiren233 11 months ago
parent d42281115f
commit 6c8745d93b

@ -45,11 +45,6 @@ var (
false,
model.SettingGroupEmail,
)
RetrievePasswordUrlPath = settings.NewStringSetting(
"email_retrieve_password_url_path",
"/web/retrievePassword",
model.SettingGroupEmail,
)
EmailSignupWhiteListEnable = settings.NewBoolSetting(
"email_signup_white_list_enable",
false,
@ -307,7 +302,7 @@ func SendRetrievePasswordCaptchaEmail(userID, email, host string) error {
if err != nil {
return err
}
u.Path = RetrievePasswordUrlPath.Get()
u.Path = `/web/auth/reset`
pool, err := getSmtpPool()
if err != nil {
@ -324,7 +319,6 @@ func SendRetrievePasswordCaptchaEmail(userID, email, host string) error {
}
q := u.Query()
q.Set("userID", userID)
q.Set("captcha", entry.Value())
q.Set("email", email)
u.RawQuery = q.Encode()

@ -532,7 +532,7 @@ func UserRetrievePasswordEmail(ctx *gin.Context) {
return
}
userE, err := op.LoadOrInitUserByID(req.UserID)
userE, err := op.LoadOrInitUserByEmail(req.Email)
if err != nil {
log.Errorf("failed to get user by email: %v", err)
ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorResp(err))

@ -198,7 +198,6 @@ func (u *UserSignupEmailReq) Validate() error {
type SendUserRetrievePasswordEmailCaptchaReq = UserSendBindEmailCaptchaReq
type UserRetrievePasswordEmailReq struct {
UserID string `json:"userID"`
Email string `json:"email"`
Captcha string `json:"captcha"`
Password string `json:"password"`
@ -209,9 +208,6 @@ func (u *UserRetrievePasswordEmailReq) Decode(ctx *gin.Context) error {
}
func (u *UserRetrievePasswordEmailReq) Validate() error {
if u.UserID == "" {
return errors.New("userID is empty")
}
if u.Captcha == "" {
return errors.New("captcha is empty")
}

Loading…
Cancel
Save