Fix login redirection in devicemgt react app

5 years ago · efe5cda576
parent 3f4acef9f0
commit efe5cda576
1 changed files with 6 additions and 1 deletions
--- a/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/pages/Login.js
+++ b/components/device-mgt/io.entgra.device.mgt.ui/react-app/src/pages/Login.js
@ -101,7 +101,12 @@ class NormalLoginForm extends React.Component {
                axios.post(window.location.origin+ config.serverConfig.loginUri, request
                ).then(res => {
                    if (res.status === 200) {
-                        window.location = window.location.origin+ "/entgra";
+                        let redirectUrl = window.location.origin + "/entgra";
+                        const searchParams = new URLSearchParams(window.location.search);
+                        if (searchParams.has("redirect")) {
+                            redirectUrl = searchParams.get("redirect");
+                        }
+                        window.location = redirectUrl;
                    }
                }).catch(function (error) {
                    if (error.response.status === 400) {