Merge branch 'MRM-6344-0.17.1' into 'release/v0.17.1'

MRM-6344 Content insurance - User buy a product - no email with documents after purchase

See merge request mashroom/backend/cardpayment!57

internal/service/callback.go

@@ -863,6 +863,8 @@ func (srv *serviceImpl) handleWebhookCheckoutSessionCompletedSubscription(
 		if err != nil {
 			return err
 		}
+
+		go srv.notifyUpdate(context.Background(), m)
 	}
 
 	return nil

internal/service/service.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"math"
 	"net/url"
+	"strings"
 
 	"github.com/golang/protobuf/ptypes"
 	"github.com/stripe/stripe-go/v72"
@@ -766,6 +767,9 @@ func (srv *serviceImpl) CreateSubscription(
 		cancel.RawQuery = q.Encode()
 	}
 
+	successURL := strings.ReplaceAll(success.String(), "%7BCHECKOUT_SESSION_ID%7D", "{CHECKOUT_SESSION_ID}")
+	cancelURL := strings.ReplaceAll(cancel.String(), "%7BCHECKOUT_SESSION_ID%7D", "{CHECKOUT_SESSION_ID}")
+
 	s, err := session.New(&stripe.CheckoutSessionParams{
 		PaymentMethodTypes: stripe.StringSlice([]string{
 			"card",
@@ -773,8 +777,8 @@ func (srv *serviceImpl) CreateSubscription(
 		LineItems:  items,
 		Mode:       stripe.String(string(stripe.CheckoutSessionModeSubscription)),
 		Customer:   stripe.String(customerID),
-		SuccessURL: stripe.String(success.String()),
-		CancelURL:  stripe.String(cancel.String()),
+		SuccessURL: stripe.String(successURL),
+		CancelURL:  stripe.String(cancelURL),
 	})
 	if err != nil {
 		return nil, err