oadmin/sub2api
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/turnstile-secret-key-preserve'

Browse Source
This commit is contained in:
shaw
2026-01-05 14:31:50 +08:00
parent 7cc7e15174 411ebe4d17
commit a60dbb5533
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/internal/handler/admin/setting_handler.go
View File

@@ -145,21 +145,18 @@ func (h *SettingHandler) UpdateSettings(c *gin.Context) {
response.BadRequest(c, "Turnstile Site Key is required when enabled") response.BadRequest(c, "Turnstile Site Key is required when enabled")
return return
} }
// 如果未提供 secret key，使用已保存的值（留空保留当前值）
if req.TurnstileSecretKey == "" { if req.TurnstileSecretKey == "" {
response.BadRequest(c, "Turnstile Secret Key is required when enabled") if previousSettings.TurnstileSecretKey == "" {
return response.BadRequest(c, "Turnstile Secret Key is required when enabled")
} return
}
// 获取当前设置，检查参数是否有变化 req.TurnstileSecretKey = previousSettings.TurnstileSecretKey
currentSettings, err := h.settingService.GetAllSettings(c.Request.Context())
if err != nil {
response.ErrorFrom(c, err)
return
} }
// 当 site_key 或 secret_key 任一变化时验证（避免配置错误导致无法登录） // 当 site_key 或 secret_key 任一变化时验证（避免配置错误导致无法登录）
siteKeyChanged := currentSettings.TurnstileSiteKey != req.TurnstileSiteKey siteKeyChanged := previousSettings.TurnstileSiteKey != req.TurnstileSiteKey
secretKeyChanged := currentSettings.TurnstileSecretKey != req.TurnstileSecretKey secretKeyChanged := previousSettings.TurnstileSecretKey != req.TurnstileSecretKey
if siteKeyChanged || secretKeyChanged { if siteKeyChanged || secretKeyChanged {
if err := h.turnstileService.ValidateSecretKey(c.Request.Context(), req.TurnstileSecretKey); err != nil { if err := h.turnstileService.ValidateSecretKey(c.Request.Context(), req.TurnstileSecretKey); err != nil {
response.ErrorFrom(c, err) response.ErrorFrom(c, err)