From 0ee680c3ab56508044f0f683e114f315a049d5b7 Mon Sep 17 00:00:00 2001 From: Ahmad Abdolsaheb Date: Wed, 19 Aug 2020 22:50:34 +0300 Subject: [PATCH] fix: redirect users to success url after /donation completion (#39404) --- client/src/components/Donation/DonateForm.js | 10 +++++++--- config/donation-settings.js | 9 ++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/client/src/components/Donation/DonateForm.js b/client/src/components/Donation/DonateForm.js index ba984c3792..693d559ab0 100644 --- a/client/src/components/Donation/DonateForm.js +++ b/client/src/components/Donation/DonateForm.js @@ -19,7 +19,8 @@ import { durationsConfig, defaultAmount, defaultStateConfig, - onetimeSKUConfig + onetimeSKUConfig, + donationUrls } from '../../../../config/donation-settings'; import { deploymentEnv } from '../../../config/env.json'; import Spacer from '../helpers/Spacer'; @@ -95,6 +96,9 @@ class DonateForm extends Component { error: error } })); + if (success) { + this.props.navigate(donationUrls.successUrl); + } } getActiveDonationAmount(durationSelected, amountSelected) { @@ -159,8 +163,8 @@ class DonateForm extends Component { }; const { error } = await stripe.redirectToCheckout({ items: [item], - successUrl: 'https://www.freecodecamp.org/news/thank-you-for-donating/', - cancelUrl: 'https://freecodecamp.org/donate' + successUrl: donationUrls.successUrl, + cancelUrl: donationUrls.cancelUrl }); console.error(error); } diff --git a/config/donation-settings.js b/config/donation-settings.js index 8e5804b41c..5d17d4e3ac 100644 --- a/config/donation-settings.js +++ b/config/donation-settings.js @@ -113,6 +113,12 @@ const paypalConfigurator = (donationAmount, donationDuration, paypalConfig) => { }; }; +// +const donationUrls = { + successUrl: 'https://www.freecodecamp.org/news/thank-you-for-donating/', + cancelUrl: 'https://freecodecamp.org/donate' +}; + module.exports = { durationsConfig, amountsConfig, @@ -124,5 +130,6 @@ module.exports = { modalDefaultStateConfig, onetimeSKUConfig, paypalConfigTypes, - paypalConfigurator + paypalConfigurator, + donationUrls };