ASUB-7844 Bug fix (#1836)

fix issue with redirect when user is not logged in and adjust setTimeout delay
WPMedia · Dec 7, 2023 · c5e8bf7 · c5e8bf7
1 parent b21fc0b
commit c5e8bf7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/blocks/subscriptions-block/components/usePaywall.js b/blocks/subscriptions-block/components/usePaywall.js
@@ -55,7 +55,7 @@ const usePaywall = () => {
 			isIdentityInitialized &&
 			!isPaywalled
 		) {
-			setTimeout(() => runPaywall(), 1000);
+			setTimeout(() => runPaywall(), 0);
 		}
 	}, [
 		apiOrigin,

diff --git a/blocks/subscriptions-block/features/checkout/_children/PaymentInfo/index.jsx b/blocks/subscriptions-block/features/checkout/_children/PaymentInfo/index.jsx
@@ -20,6 +20,7 @@ const PaymentInfo = ({
 	isInitialized,
 	successUpdateURL,
 	isPaymentMethodUpdate = false,
+	loginURL
 }) => {
 
 	const { Sales } = useSales();
@@ -101,7 +102,7 @@ const PaymentInfo = ({
 
 	const handlePayPal = async () => {
 		const isLoggedIn = await Identity.isLoggedIn();
-
+		const checkoutURL = window.location.pathname;
 		if (!isLoggedIn) {
 			window.location.href = `${loginURL}?redirect=${checkoutURL}`;
 		}

diff --git a/blocks/subscriptions-block/features/checkout/default.jsx b/blocks/subscriptions-block/features/checkout/default.jsx
@@ -10,7 +10,7 @@ export const LABEL_ORDER_NUMBER_PAYPAL = "ArcSubs_OrderNumber"
 const BLOCK_CLASS_NAME = "b-checkout";
 
 const Checkout = ({ customFields }) => {
-	const { offerURL, successURL, stripeIntentsID } = customFields;
+	const { offerURL, successURL, loginURL, stripeIntentsID } = customFields;
 
 	const [loggedIn, setIsLoggedIn] = useState(false);
 	const [user, setUser] = useState(false);
@@ -102,15 +102,21 @@ const Checkout = ({ customFields }) => {
 					offerURL={offerURL}
 					stripeIntentsID={stripeIntentsID}
 					isInitialized = {isInitialized}
+					loginURL = {loginURL}
 				/>
 			)}
 		</section>
 	);
 };
 Checkout.propTypes = {
 	customFields: PropTypes.shape({
+		loginURL: PropTypes.string.tag({
+			defaultValue: "/account/login/",
+			label: "Login URL",
+		}),
 		offerURL: PropTypes.string.tag({
 			defaultValue: "/offer/",
+			label: "Offer URL",
 		}),
 		successURL: PropTypes.string.tag({
 			defaultValue: "/",