fix login page redirect

Author: yunakim714

packages/template-retail-react-app/app/hooks/use-auth-modal.js

@@ -93,6 +93,9 @@ export const AuthModal = ({
     const {getPasswordResetToken} = usePasswordReset()
     const authorizePasswordlessLogin = useAuthHelper(AuthHelpers.AuthorizePasswordless)
     const passwordlessConfigCallback = getConfig().app.login?.passwordless?.callbackURI
+    const callbackURL = isAbsoluteURL(passwordlessConfigCallback)
+        ? passwordlessConfigCallback
+        : `${appOrigin}${passwordlessConfigCallback}`
 
     const {data: baskets} = useCustomerBaskets(
         {parameters: {customerId}},
@@ -109,10 +112,7 @@ export const AuthModal = ({
 
         const handlePasswordlessLogin = async (email) => {
             try {
-                const callbackURL = isAbsoluteURL(passwordlessConfigCallback)
-                    ? passwordlessConfigCallback
-                    : `${appOrigin}${passwordlessConfigCallback}`
-                const redirectPath = window.location.pathname
+                const redirectPath = window.location.pathname + window.location.search
                 await authorizePasswordlessLogin.mutateAsync({
                     userid: email,
                     callbackURI: `${callbackURL}?redirectUrl=${redirectPath}`

packages/template-retail-react-app/app/pages/checkout/partials/contact-info.jsx

@@ -82,13 +82,13 @@ const ContactInfo = ({isSocialEnabled = false, isPasswordlessEnabled = false, id
     const authModal = useAuthModal(authModalView)
     const [isPasswordlessLoginClicked, setIsPasswordlessLoginClicked] = useState(false)
     const passwordlessConfigCallback = getConfig().app.login?.passwordless?.callbackURI
+    const callbackURL = isAbsoluteURL(passwordlessConfigCallback)
+        ? passwordlessConfigCallback
+        : `${appOrigin}${passwordlessConfigCallback}`
 
     const handlePasswordlessLogin = async (email) => {
         try {
-            const callbackURL = isAbsoluteURL(passwordlessConfigCallback)
-                ? passwordlessConfigCallback
-                : `${appOrigin}${passwordlessConfigCallback}`
-            const redirectPath = window.location.pathname
+            const redirectPath = window.location.pathname + window.location.search
             await authorizePasswordlessLogin.mutateAsync({
                 userid: email,
                 callbackURI: `${callbackURL}?redirectUrl=${redirectPath}`

packages/template-retail-react-app/app/pages/login/index.jsx

@@ -151,8 +151,9 @@ const Login = ({initialView = LOGIN_VIEW}) => {
     useEffect(() => {
         if (path === PASSWORDLESS_LOGIN_LANDING_PATH && isSuccessCustomerBaskets) {
             const token = decodeURIComponent(queryParams.get('token'))
-            const redirect_url = decodeURIComponent(queryParams.get('redirect_url'))
-            setRedirectPath(redirect_url)
+            if (queryParams.get('redirect_url')) {
+                setRedirectPath(decodeURIComponent(queryParams.get('redirect_url')))
+            } 
 
             const passwordlessLogin = async () => {
                 try {
@@ -173,12 +174,9 @@ const Login = ({initialView = LOGIN_VIEW}) => {
     useEffect(() => {
         if (isRegistered) {
             handleMergeBasket()
-            if (redirectPath) {
-                navigate(redirectPath)
-                setRedirectPath('')
-            } else {
-                navigate('/account')
-            }
+            const redirectTo = redirectPath ? redirectPath : '/account'
+            navigate(redirectTo)
+            setRedirectPath('')
         }
     }, [isRegistered])