Merge branch 'arc-themes-release-version-2.5.0' into ASUB-8521-Social…

…MediaButtons
WPMedia · Jul 29, 2024 · 6ef61d4 · 6ef61d4
2 parents 5db9e95 + 236fba9
commit 6ef61d4
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 26 deletions.
diff --git a/blocks/identity-block/components/login/index.jsx b/blocks/identity-block/components/login/index.jsx
@@ -20,6 +20,16 @@ const useLogin = ({
 	const [isAppleAuthSuccess, setIsAppleAuthSuccess] = useState(false);
 	const { loginByOIDC } = useOIDCLogin();
 
+	const setRedirectUrl = (url) => {
+		setCurrentRedirectToURL(url);
+		sessionStorage.setItem('ArcXP_redirectUrl', url);
+	};
+
+	const getRedirectURL = () => {
+		const localStorageRedirectUrl = sessionStorage.getItem('ArcXP_redirectUrl');
+
+		return redirectQueryParam || localStorageRedirectUrl || currentRedirectToURL;
+	};
 
 	useEffect(() => {
 		const askForloginWithApple = async (code) => {
@@ -55,16 +65,17 @@ const useLogin = ({
 
 		if (redirectToPreviousPage && document?.referrer) {
 			const redirectUrlLocation = new URL(document.referrer);
+			let newRedirectUrl = redirectUrlLocation.pathname.includes('/pagebuilder/')
+				? redirectURL
+				: `${redirectUrlLocation.pathname}${redirectUrlLocation.search}`;
 
 			if (searchParams.has('reset_password')) {
-				setCurrentRedirectToURL(`${redirectURL}${redirectUrlLocation.search}`);
-			} else {
-				const newRedirectUrl = redirectUrlLocation.pathname.includes('/pagebuilder/')
-					? redirectURL
-					: `${redirectUrlLocation.pathname}${redirectUrlLocation.search}`;
+				newRedirectUrl = `${redirectURL}${redirectUrlLocation.search}`;
 
-				setCurrentRedirectToURL(newRedirectUrl);
+				setRedirectUrl(newRedirectUrl);
 			}
+
+			setRedirectUrl(newRedirectUrl);
 		}
 	}, [redirectQueryParam, redirectToPreviousPage, redirectURL]);
 
@@ -88,7 +99,11 @@ const useLogin = ({
 				if (isOIDC) {
 					loginByOIDC();
 				} else {
-					window.location = redirectQueryParam || validatedLoggedInPageLoc;
+					const localStorageRedirectUrl = sessionStorage.getItem('ArcXP_redirectUrl');
+					const validatedLocalRedirectURL = validateURL(localStorageRedirectUrl);
+					const newRedirectUrl = redirectQueryParam || validatedLocalRedirectURL || validatedLoggedInPageLoc;
+
+					window.location = newRedirectUrl;
 				}
 			}
 		};
@@ -98,7 +113,7 @@ const useLogin = ({
 	}, [Identity, redirectQueryParam, loggedInPageLocation, isAdmin, loginByOIDC, isOIDC, isAppleAuthSuccess]);
 
 	return {
-		loginRedirect: redirectQueryParam || currentRedirectToURL,
+		loginRedirect: getRedirectURL(),
 	};
 };
 

diff --git a/blocks/identity-block/components/login/index.test.jsx b/blocks/identity-block/components/login/index.test.jsx
@@ -32,16 +32,18 @@ const Test = (props) => {
 	);
 };
 
+const windowLocationValues = {
+	origin: 'http://localhost',
+	href: 'http://localhost',
+	search: '',
+	pathname: '/',
+}
+
 describe("useLogin()", () => {
 	beforeEach(() => {
 		Object.defineProperty(window, "location", {
 			writable: true,
-			value: {
-				origin: 'http://localhost',
-				href: 'http://localhost',
-				search: '',
-				pathname: '/',
-			}
+			value: windowLocationValues,
 		});
 		useIdentity.mockImplementation(() => ({
 			isInitialized: true,
@@ -64,6 +66,7 @@ describe("useLogin()", () => {
 
 	it("uses redirect query", async () => {
 		Object.defineProperty(window, "location", {
+			...windowLocationValues,
 			writable: true,
 			value: {
 				search: "?test=123&redirect=/new-account/",
@@ -97,6 +100,7 @@ describe("useLogin()", () => {
 		Object.defineProperty(window, "location", {
 			writable: true,
 			value: {
+				...windowLocationValues,
 				origin: 'http://localhost',
 				href: 'http://localhost',
 				search: '?reset_password=true',
@@ -118,13 +122,15 @@ describe("useLogin()", () => {
 			},
 		}));
 		await render(<Test />);
-		expect(window.location).toBe(`http://localhost${defaultParams.loggedInPageLocation}`);
+
+		expect(window.location).toBe(`http://localhost${defaultParams.redirectURL}`);
 	});
 
 	it("replaces potentially unsafe URLs in query param", async () => {
 		Object.defineProperty(window, "location", {
 			writable: true,
 			value: {
+				...windowLocationValues,
 				search: "?test=123&redirect=https://somewhere.com",
 				pathname: "/",
 			},
@@ -134,21 +140,23 @@ describe("useLogin()", () => {
 		expect(window.location).toBe("/");
 	});
 
-	it("replaces potentially unsafe URLs in redirectURL parameter", async () => {
-		await render(<Test redirectURL="https://somewhere.com" />);
+	it("replaces potentially unsafe URLs in query param", async () => {
+		Object.defineProperty(window, "location", {
+			writable: true,
+			value: {
+				...windowLocationValues,
+				search: "",
+				pathname: "/",
+			},
+		});
+		await render(<Test loggedInPageLocation="https://somewhere.com" />);
 		fireEvent.click(screen.getByRole("button"));
 		expect(window.location).toBe("/");
 	});
 
-	it("replaces potentially unsafe URLs in loggedInPageLocation parameter", async () => {
-		useIdentity.mockImplementation(() => ({
-			isInitialized: true,
-			Identity: {
-				isLoggedIn: jest.fn(() => true),
-				getConfig: jest.fn(() => ({})),
-			},
-		}));
-		await render(<Test loggedInPageLocation="https://somewhere.com" />);
+	it("replaces potentially unsafe URLs in redirectURL parameter", async () => {
+		await render(<Test redirectURL="https://somewhere.com" />);
+		fireEvent.click(screen.getByRole("button"));
 		expect(window.location).toBe("/");
 	});
 
@@ -161,6 +169,7 @@ describe("useLogin()", () => {
 		Object.defineProperty(window, "location", {
 			writable: true,
 			value: {
+				...windowLocationValues,
 				origin: 'http://localhost',
 				href: 'http://localhost',
 				search: '',
@@ -172,4 +181,38 @@ describe("useLogin()", () => {
 		expect(window.location).toBe("/account/");
 		delete document.referrer;
 	});
+
+	it("should use redirectUrl from sessionStorage", async () => {
+		const referrerURL = "http://localhost/featured-articles/";
+		Object.defineProperty(document, "referrer", {
+			value: referrerURL,
+			configurable: true,
+		});
+		Object.defineProperty(window, "location", {
+			writable: true,
+			value: {
+				...windowLocationValues,
+				origin: 'http://localhost',
+				href: 'http://localhost',
+				search: '',
+				pathname: '/'
+			}
+		});
+
+		useIdentity.mockImplementation(() => ({
+			isInitialized: true,
+			Identity: {
+				isLoggedIn: jest.fn(() => true),
+				getConfig: jest.fn(() => ({})),
+			},
+		}));
+
+		await render(<Test />);
+
+		expect(sessionStorage.getItem("ArcXP_redirectUrl")).toBe('/featured-articles/');
+
+		fireEvent.click(screen.getByRole("button"));
+		expect(window.location).toBe("/featured-articles/");
+		delete document.referrer;
+	});
 });
diff --git a/blocks/identity-block/utils/validate-redirect-url.js b/blocks/identity-block/utils/validate-redirect-url.js
@@ -13,6 +13,7 @@ const validateURL = (url) => {
 		return url;
 	}
 
+	sessionStorage.setItem("ArcXP_redirectUrl", "/");
 	return "/";
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ const validateURL = (url) => { @@
     		return url;
     	}
+    	sessionStorage.setItem("ArcXP_redirectUrl", "/");
     	return "/";
     };
@@ Expand Down @@