[FIX] Login redirection from login/forgot password pages

frg-fossee · May 30, 2021 · 3b2803d · 3b2803d
1 parent fc1ec07
commit 3b2803d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/eda-frontend/src/pages/Login.js b/eda-frontend/src/pages/Login.js
@@ -58,7 +58,10 @@ export default function SignIn (props) {
   useEffect(() => {
     dispatch(authDefault())
     document.title = 'Login - eSim '
-    if (props.location.search !== '') {
+    const ardUrl = localStorage.getItem('ard_redurl')
+    if (ardUrl && ardUrl !== '') {
+      url = ardUrl
+    } else if (props.location.search !== '') {
       const query = new URLSearchParams(props.location.search)
       url = query.get('url')
       localStorage.setItem('ard_redurl', url)

diff --git a/eda-frontend/src/pages/ResetPassword/Initiation.js b/eda-frontend/src/pages/ResetPassword/Initiation.js
@@ -84,7 +84,7 @@ export default function ResetPassword () {
             fullWidth
             variant="contained"
             color="primary"
-            onClick={() => dispatch(resetPassword(email))}
+            onClick={() => { email.length > 0 && dispatch(resetPassword(email)) }}
             className={classes.submit}
             disabled={false}
           >

diff --git a/eda-frontend/src/redux/actions/authActions.js b/eda-frontend/src/redux/actions/authActions.js
@@ -76,6 +76,7 @@ export const login = (username, password, toUrl) => {
             dispatch(loadUser())
           } else {
             window.open(toUrl, '_self')
+            localStorage.setItem('ard_redurl', '')
           }
         } else if (res.status === 400 || res.status === 403 || res.status === 401) {
           dispatch({