Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: add two-step generate checkout link

goenningfa6c12288855
diff --git a/app/models/cmd/http.go b/app/models/cmd/http.go
index 52f1d1c3c..7d6d2f27a 100644
--- a/app/models/cmd/http.go
+++ b/app/models/cmd/http.go
@@ -2,6 +2,7 @@ package cmd
import (
"io"
+ "net/http"
"github.com/getfider/fider/app/models/dto"
)
@@ -16,4 +17,5 @@ type HTTPRequest struct {
//Output
ResponseBody []byte
ResponseStatusCode int
+ ResponseHeader http.Header
}
diff --git a/app/services/billing/paddle/paddle.go b/app/services/billing/paddle/paddle.go
index 2e75a3c8a..6ceee2de5 100644
--- a/app/services/billing/paddle/paddle.go
+++ b/app/services/billing/paddle/paddle.go
@@ -47,6 +47,10 @@ func getApiBasePath() string {
return "https://vendors.paddle.com"
}
+// generateCheckoutLink generates a checkout link using Paddle API
+// It's a 2-steps process:
+// 1. Create a "Custom Checkout Create URL
+// 2. Use that URL to generate a Checkout Link and return it
func generateCheckoutLink(ctx context.Context, c *cmd.GenerateCheckoutLink) error {
passthrough, err := json.Marshal(c.Passthrough)
if err != nil {
@@ -86,7 +90,35 @@ func generateCheckoutLink(ctx context.Context, c *cmd.GenerateCheckoutLink) erro
return errors.New("failed to generate paddle checkout link with '%s (%d)'", res.Error.Message, res.Error.Code)
}
- c.URL = jsonq.New(string(res.Response)).String("url")
+ // the "url" here is the "Custom Checkout Create URL", we need to append some extra QueryString parameters
+ u, err := url.Parse(jsonq.New(string(res.Response)).String("url"))
+ if err != nil {
+ return errors.Wrap(err, "generated paddle checkout url is invalid")
+ }
+
+ // parent_url and parentURL must match one of the approved domains in Paddle.com
+ q := u.Query()
+ q.Set("parent_url", fmt.Sprintf("https://%s", env.Config.HostDomain))
+ q.Set("parentURL", fmt.Sprintf("https://%s", env.Config.HostDomain))
+ u.RawQuery = q.Encode()
+
+ req = &cmd.HTTPRequest{
+ URL: u.String(),
+ Method: http.MethodGet,
+ }
+
+ if err := bus.Dispatch(ctx, req); err != nil {
+ return errors.Wrap(err, "failed to generate paddle checkout link")
+ }
+
+ if req.ResponseStatusCode <= 299 || req.ResponseStatusCode >= 400 {
+ return errors.New("unexpected status code while generating a paddle checkout link: %d", req.ResponseStatusCode)
+ }
+
+ c.URL = req.ResponseHeader.Get("location")
+ if c.URL == "" {
+ return errors.New("response is missing 'location' header")
+ }
return nil
}
diff --git a/app/services/httpclient/httpclient.go b/app/services/httpclient/httpclient.go
index ea258ae82..b5069061b 100644
--- a/app/services/httpclient/httpclient.go
+++ b/app/services/httpclient/httpclient.go
@@ -12,7 +12,12 @@ import (
)
func init() {
- http.DefaultClient.Timeout = 30 * time.Second
+ http.DefaultClient = &http.Client{
+ Timeout: 30 * time.Second,
+ CheckRedirect: func(req *http.Request, via []*http.Request) error {
+ return http.ErrUseLastResponse
+ },
+ }
bus.Register(Service{})
}
@@ -61,5 +66,6 @@ func requestHandler(ctx context.Context, c *cmd.HTTPRequest) error {
c.ResponseBody = respBody
c.ResponseStatusCode = res.StatusCode
+ c.ResponseHeader = res.Header
return nil
}
diff --git a/public/pages/Administration/pages/ManageBilling.page.tsx b/public/pages/Administration/pages/ManageBilling.page.tsx
index c46f3652b..83e6e8e1d 100644
--- a/public/pages/Administration/pages/ManageBilling.page.tsx
+++ b/public/pages/Administration/pages/ManageBilling.page.tsx
@@ -178,13 +178,12 @@ const ManageBillingPage = (props: ManageBillingPageProps) => {
{showPaddleFooter && (
<p className="text-muted mt-4">
- We use{" "}
<strong>
<a href="https://paddle.com" target="_blank" rel="noopener" className="text-link">
Paddle
</a>
</strong>{" "}
- as our billing partner. You may see {'"PADDLE.NET* FIDER"'} on your credit card.
+ is our billing partner. You may see {'"PADDLE.NET* FIDER"'} on your credit card.
</p>
)}
</AdminPageContainer>