add localstorage to redirect url

Author: accbjt

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);
+		localStorage.setItem('ArcXP_redirectUrl', url);
+	};
+
+	const getRedirectURL = () => {
+		const localStorageRedirectUrl = localStorage.getItem('ArcXP_redirectUrl');
+
+		return redirectQueryParam || localStorageRedirectUrl || currentRedirectToURL;
+	};
 
 	useEffect(() => {
 		const askForloginWithApple = async (code) => {
@@ -57,13 +67,15 @@ const useLogin = ({
 			const redirectUrlLocation = new URL(document.referrer);
 
 			if (searchParams.has('reset_password')) {
-				setCurrentRedirectToURL(`${redirectURL}${redirectUrlLocation.search}`);
+				const newRedirectUrl = `${redirectURL}${redirectUrlLocation.search}`;
+
+				setRedirectUrl(newRedirectUrl);
 			} else {
 				const newRedirectUrl = redirectUrlLocation.pathname.includes('/pagebuilder/')
 					? redirectURL
 					: `${redirectUrlLocation.pathname}${redirectUrlLocation.search}`;
 
-				setCurrentRedirectToURL(newRedirectUrl);
+				setRedirectUrl(newRedirectUrl);
 			}
 		}
 	}, [redirectQueryParam, redirectToPreviousPage, redirectURL]);
@@ -88,8 +100,11 @@ const useLogin = ({
 				if (isOIDC) {
 					loginByOIDC();
 				} else {
-					window.location = redirectQueryParam || validatedLoggedInPageLoc;
+					const localStorageRedirectUrl = localStorage.getItem('ArcXP_redirectUrl');
+
+					window.location = redirectQueryParam || localStorageRedirectUrl || validatedLoggedInPageLoc;
 				}
+				localStorage.removeItem('ArcXP_redirectUrl');
 			}
 		};
 		if (Identity && !isAdmin) {
@@ -98,7 +113,7 @@ const useLogin = ({
 	}, [Identity, redirectQueryParam, loggedInPageLocation, isAdmin, loginByOIDC, isOIDC, isAppleAuthSuccess]);
 
 	return {
-		loginRedirect: redirectQueryParam || currentRedirectToURL,
+		loginRedirect: getRedirectURL(),
 	};
 };
 

blocks/identity-block/components/social-sign-on/_children/AppleSignIn.jsx

@@ -14,19 +14,19 @@ function AppleSignIn({ socialSignOnIn, className }) {
 	const { Identity } = useIdentity();
 
 	return (
-			<Button
-				id="apple-btn"
-				variant="secondary-reverse"
-				onClick={() => Identity.initAppleSignOn()}
-				iconLeft={AppleIcon}
-				className={`${className}__Apple`}
-			>
-				{socialSignOnIn !== SIGN_UP ? (
-					<span>{phrases.t("identity-block.social-signOn-apple-login")}</span>
-				) : (
-					<span>{phrases.t("identity-block.social-signOn-apple-signUp")}</span>
-				)}
-			</Button>
+		<Button
+			id="apple-btn"
+			variant="secondary-reverse"
+			onClick={() => Identity.initAppleSignOn()}
+			iconLeft={AppleIcon}
+			className={`${className}__Apple`}
+		>
+			{socialSignOnIn !== SIGN_UP ? (
+				<span>{phrases.t("identity-block.social-signOn-apple-login")}</span>
+			) : (
+				<span>{phrases.t("identity-block.social-signOn-apple-signUp")}</span>
+			)}
+		</Button>
 	);
 }
 

blocks/identity-block/components/social-sign-on/index.jsx

@@ -6,11 +6,11 @@ import AppleSignIn from "./_children/AppleSignIn";
 import useSocialSignIn from "./utils/useSocialSignIn";
 
 const SocialSignOn = ({ className, onError, redirectURL, isOIDC, socialSignOnIn }) => {
-	const { facebookAppId, googleClientId, appleTeamId, appleKeyId, appleUrlToReceiveAuthToken} = useSocialSignIn(redirectURL, isOIDC, socialSignOnIn, onError);
+	const { facebookAppId, googleClientId, appleTeamId, appleKeyId, appleUrlToReceiveAuthToken } = useSocialSignIn(redirectURL, isOIDC, socialSignOnIn, onError);
 	return (
 		<section className={className}>
 			{googleClientId ? <GoogleSignIn onError={onError} redirectURL={redirectURL} socialSignOnIn={socialSignOnIn} className={className} /> : null}
-			{facebookAppId ? <FacebookSignIn socialSignOnIn={socialSignOnIn}/> : null}
+			{facebookAppId ? <FacebookSignIn socialSignOnIn={socialSignOnIn} /> : null}
 			{appleTeamId && appleKeyId && appleUrlToReceiveAuthToken ? <AppleSignIn socialSignOnIn={socialSignOnIn} className={className} /> : null}
 		</section>
 	);

blocks/identity-block/components/social-sign-on/utils/useSocialSignIn.js

@@ -51,6 +51,7 @@ function useSocialSignIn(redirectURL, isOIDC, socialSignOnIn, onError = () => {}
 							loginByOIDC();
 						} else {
 							const validatedURL = validateURL(redirectURL);
+
 							window.location = validatedURL;
 						}
 					}),

blocks/identity-block/features/account-management/default.jsx

@@ -43,6 +43,7 @@ function AccountManagement({ customFields }) {
 		const checkLoggedInStatus = () =>
 			Identity.isLoggedIn().then((isLoggedIn) => {
 				if (!isLoggedIn) {
+
 					window.location = redirectURL;
 					return;
 				}

blocks/identity-block/features/login/default.jsx

@@ -90,6 +90,7 @@ const Login = ({ customFields }) => {
 							loginByOIDC();
 						} else {
 							const validatedURL = validateURL(loginRedirect);
+
 							window.location = validatedURL;
 						}
 					})

blocks/identity-block/features/social-sign-on/default.jsx

@@ -60,7 +60,7 @@ const SocialSignOnBlock = ({ customFields }) => {
 
 	return (
 		<Stack className={BLOCK_CLASS_NAME} data-testid="social-sign-on-container">
-				{!hideDiv ? <div className={`${BLOCK_CLASS_NAME}__dividerWithText`}>{phrases.t("identity-block.or")}</div> : null}
+			{!hideDiv ? <div className={`${BLOCK_CLASS_NAME}__dividerWithText`}>{phrases.t("identity-block.or")}</div> : null}
 			<GoogleSignInProvider>
 				<SocialSignOn
 					className={`${BLOCK_CLASS_NAME}__button-container`}