fix(topup): use theme-aware return URLs for epay and stripe

[pholex]

Problem

The default frontend (v1) introduced in v1.0.0-rc.1 reorganized routes to drop the /console/ prefix:

Page	classic	default (v1)
Usage logs	/console/log	/usage-logs
Topup/wallet	/console/topup	/wallet

But payment-related controllers (controller/topup.go, controller/topup_stripe.go) still hardcode the classic paths for return / success / cancel URLs. This causes a 404 in the v1 UI after the user completes payment, since the v1 router does not recognize /console/log or /console/topup.

Reproduction (with default frontend active):

1. Configure epay or Stripe in admin
2. Buy a top-up via the user-facing topup page
3. Complete payment in the provider's flow
4. Land back on the new-api domain → 404

Fix

Select the appropriate path at request time based on common.GetTheme(). Classic paths remain the fallback so existing classic deployments are unaffected.

returnPath := "/console/log"
if common.GetTheme() == "default" {
    returnPath = "/usage-logs"
}

common.GetTheme() reads an atomic value updated when the admin toggles the frontend in 设置 → 其他设置 → 切换到新版前端, so the change takes effect immediately without restarting.

Affected URLs

Caller	Field	classic	default
controller/topup.go	epay return	/console/log	/usage-logs
controller/topup_stripe.go	stripe success	/console/log	/usage-logs
controller/topup_stripe.go	stripe cancel	/console/topup	/wallet

Tested

• Deployed to a sandbox environment with theme.frontend=default.
• Completed an epay→Alipay-sandbox top-up; browser correctly lands on /usage-logs (HTTP 200) showing the new top-up record. Async notify and quota credit work end-to-end.
• Compiles cleanly with go build ./controller/.

Compatibility

• Classic frontend deployments: no behavior change (path unchanged).
• Default (v1) frontend deployments: 404 → working page.
• Existing custom success_url / cancel_url overrides on Stripe still take precedence; the conditional only affects the empty-URL fallback.

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: dbc562c7-e096-4720-a195-df8a1b01547e

📥 Commits

Reviewing files that changed from the base of the PR and between dac55f0 and 0aee295.

📒 Files selected for processing (2)

• controller/topup.go
• controller/topup_stripe.go

---

Walkthrough

The PR adds theme-aware logic to payment return URLs. RequestEpay and genStripeLink now select redirect paths based on common.GetTheme(), using /usage-logs for "default" theme and /console/log or /console/topup otherwise, replacing hardcoded paths.

Changes

Theme-Based Payment Redirect URLs

Layer / File(s)	Summary
Core Logic controller/topup.go, controller/topup_stripe.go	RequestEpay and genStripeLink conditionally select return/redirect paths: /usage-logs and /wallet for "default" theme, /console/log and /console/topup otherwise.
Integration controller/topup.go, controller/topup_stripe.go	Paths are combined with system_setting.ServerAddress to construct final return/redirect URLs only when custom URLs are not provided.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

• QuantumNous/new-api#2745: Both PRs modify redirect URL handling for payments — they change default/returned success/cancel ReturnUrl logic in controller/topup_stripe.go (and related topup controller).
• QuantumNous/new-api#2124: Both PRs modify top-up redirect URLs and specifically change defaults in controller/topup_stripe.go (Stripe success/cancel targets).
• QuantumNous/new-api#1807: Both PRs modify the Stripe redirect target in genStripeLink (changing/choosing between "/log" and "/console/log").

Suggested reviewers

• seefs001

Poem

🐰 A theme-aware hop through payment flows so bright,
Default paths dance left, alternate paths dance right,
E-pay and Stripe now sing in sync with theme,
No hardcoded URLs to spoil the dream! ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change: making return URLs theme-aware in topup controllers for both epay and stripe integrations.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

Tip

💬 Introducing Slack Agent: The best way for teams to turn conversations into code.

Slack Agent is built on CodeRabbit's deep understanding of your code, so your team can collaborate across the entire SDLC without losing context.

• Generate code and open pull requests
• Plan features and break down work
• Investigate incidents and troubleshoot customer tickets together
• Automate recurring tasks and respond to alerts with triggers
• Summarize progress and report instantly

Built for teams:

• Shared memory across your entire org—no repeating context
• Per-thread sandboxes to safely plan and execute work
• Governance built-in—scoped access, auditability, and budget controls

One agent for your entire SDLC. Right inside Slack.

👉 Get started

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[Calcium-Ion]

审了 diff，改动本身 LGTM：

• controller/topup.go 和 controller/topup_stripe.go 根据 common.GetTheme() 判断返回路径，default 主题用 /usage-logs 和 /wallet，classic 用 /console/log 和 /console/topup。
• 逻辑简单清晰，无后端兼容问题。

但有两个问题：

1. PR 目前有 merge conflicts，需要 rebase 到最新 main。
2. Issue #4765 还提到了 topup_waffo* 和 subscription_payment_* 控制器也有同样的硬编码路径问题，这个 PR 只覆盖了 epay 和 stripe。是否需要追一个补丁 PR 覆盖其余支付控制器？

请 rebase 解决冲突后我再 approve + merge。

[pholex]

感谢 @Calcium-Ion 的 review！

注意到 upstream 已经在 #4802 (commit 469d374, 2026-05-12) 通过引入 common.ThemeAwarePath() 和 controller/paymentReturnPath() helper 独立实现了同样的修复，并且覆盖更全面：

• /console/log → /usage-logs
• /console/topup → /wallet
• /console/personal → /profile（本 PR 未覆盖）

已应用到全部 6 个支付控制器（topup / topup_stripe / topup_waffo / topup_waffo_pancake / subscription_payment_epay / subscription_payment_stripe），比本 PR 的方案更优雅。

故关闭本 PR，问题已通过上游实现解决。