szx/NewSzxcn-Email
1
0
Fork 0
Code Issues Pull Requests Actions 55 Packages Projects Releases Wiki Activity

fix: keep forwarding verification links idempotent

Browse Source
This commit is contained in:
zxyszx
2026-08-02 09:36:30 +08:00
parent 9f330fdf57
commit 83ca0dd7d7
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/internal/app/app_test.go
+6
View File
@@ -1748,6 +1748,9 @@ func TestInboundForwardingSettingsAndDelivery(t *testing.T) {
if code := admin.do("GET", "/api/verify-email?token="+url.QueryEscape(token), nil, nil); code != http.StatusOK {
t.Fatalf("verify email code=%d", code)
}
if code := admin.do("GET", "/api/verify-email?token="+url.QueryEscape(token), nil, nil); code != http.StatusOK {
t.Fatalf("reopen verified email link code=%d", code)
}
if code := admin.do("GET", "/api/me/forwarding", nil, &settings); code != http.StatusOK {
t.Fatalf("reload forwarding settings code=%d", code)
}
@@ -1782,6 +1785,9 @@ func TestInboundForwardingSettingsAndDelivery(t *testing.T) {
if code := admin.do("GET", "/api/verify-email?token="+url.QueryEscape(token), nil, nil); code != http.StatusOK {
t.Fatalf("verify account target code=%d", code)
}
if code := admin.do("GET", "/api/verify-email?token="+url.QueryEscape(token), nil, nil); code != http.StatusOK {
t.Fatalf("reopen account verification link code=%d", code)
}
if code := admin.do("POST", "/api/me/forwarding/account", map[string]string{"targetEmail": "account-forward@example.test"}, &settings); code != http.StatusOK || settings.AccountTargetEmail != "account-forward@example.test" {
t.Fatalf("save account forwarding code=%d settings=%+v", code, settings)
}
apps/api/internal/app/forwarding_handlers.go
+1 -1
View File
@@ -157,7 +157,7 @@ func (a *App) handleVerifyForwardingEmail(w http.ResponseWriter, r *http.Request
}
now := a.now().UTC().Format(time.RFC3339Nano)
_, err = a.db.ExecContext(r.Context(), `UPDATE forwarding_verified_emails
SET verified=1,verified_at=?,verification_token_hash='',delivery_status='verified',delivery_error='',updated_at=?
SET verified=1,verified_at=?,delivery_status='verified',delivery_error='',updated_at=?
WHERE id=?`, now, now, id)
if err != nil {
a.renderForwardingVerificationPage(w, http.StatusInternalServerError, false, email, "验证失败，请稍后重试")