Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pholex wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion controller/topup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,11 @@ func RequestEpay(c *gin.Context) {
}

callBackAddress := service.GetCallbackAddress()
returnUrl, _ := url.Parse(system_setting.ServerAddress + "/console/log")
returnPath := "/console/log"
if common.GetTheme() == "default" {
returnPath = "/usage-logs"
}
returnUrl, _ := url.Parse(system_setting.ServerAddress + returnPath)
notifyUrl, _ := url.Parse(callBackAddress + "/api/user/epay/notify")
tradeNo := fmt.Sprintf("%s%d", common.GetRandomString(6), time.Now().Unix())
tradeNo = fmt.Sprintf("USR%dNO%s", id, tradeNo)
Expand Down
12 changes: 9 additions & 3 deletions controller/topup_stripe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,18 @@ func genStripeLink(referenceId string, customerId string, email string, amount i

stripe.Key = setting.StripeApiSecret

// Use custom URLs if provided, otherwise use defaults
// Use custom URLs if provided, otherwise use defaults based on the active frontend theme
successPath := "/console/log"
cancelPath := "/console/topup"
if common.GetTheme() == "default" {
successPath = "/usage-logs"
cancelPath = "/wallet"
}
if successURL == "" {
successURL = system_setting.ServerAddress + "/console/log"
successURL = system_setting.ServerAddress + successPath
}
if cancelURL == "" {
cancelURL = system_setting.ServerAddress + "/console/topup"
cancelURL = system_setting.ServerAddress + cancelPath
}

params := &stripe.CheckoutSessionParams{
Expand Down