Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-25 02:31:59 -05:00
Code Issues Activity

Updated cancelation URL for donations (#17555)

Browse source 
refs https://github.com/TryGhost/Product/issues/3650
- also adds an await on the .json() call
This commit is contained in:
Sag 2023-08-01 17:19:15 +02:00 • committed by GitHub
parent 6d85ea4425
commit 4e0f52a7cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/portal/src/components/pages/SupportPage.js
View file

@ -15,7 +15,7 @@ const SupportPage = () => {
const siteUrl = window.location.origin; const siteUrl = window.location.origin;
const currentUrl = siteUrl + window.location.pathname; const currentUrl = siteUrl + window.location.pathname;
const successUrl = `${currentUrl}#/portal/support/success`; const successUrl = `${currentUrl}#/portal/support/success`;
const cancelUrl = `${currentUrl}#/portal/support/error`; const cancelUrl = currentUrl;
const api = setupGhostApi({siteUrl}); const api = setupGhostApi({siteUrl});
try { try {

8
apps/portal/src/utils/api.js
View file

@ -424,14 +424,14 @@ function setupGhostApi({siteUrl = window.location.origin, apiUrl, apiKey}) {
body: JSON.stringify(body) body: JSON.stringify(body)
}); });
if (!response.ok) { const responseJson = await response.json();
const errorData = await response.json();
const errorMessage = errorData?.errors?.[0]?.message || 'There was an error processing your payment. Please try again.';
if (!response.ok) {
const errorMessage = responseJson?.errors?.[0]?.message || 'There was an error processing your payment. Please try again.';
throw new Error(errorMessage); throw new Error(errorMessage);
} }
return response.json(); return responseJson;
}, },
async editBilling({successUrl, cancelUrl, subscriptionId} = {}) { async editBilling({successUrl, cancelUrl, subscriptionId} = {}) {