Merge branch 'device-mgt-redirection-fix' into 'master'

Fix login redirection in devicemgt react app

Closes product-iots#297

See merge request entgra/carbon-device-mgt!411
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit e1f7c3b073

@ -101,7 +101,12 @@ class NormalLoginForm extends React.Component {
axios.post(window.location.origin+ config.serverConfig.loginUri, request axios.post(window.location.origin+ config.serverConfig.loginUri, request
).then(res => { ).then(res => {
if (res.status === 200) { 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) { }).catch(function (error) {
if (error.response.status === 400) { if (error.response.status === 400) {

Loading…
Cancel
Save