DashboardRoute

const DashboardRoute = (props) => {
    const { component: Component, isAuthenticated, ...rest } = props;
    return (
        <Route
            {...rest}
            render={matchProps => {
                return isAuthenticated ? (
                    <DashboardLayout>
                        <Component {...props} />
                    </DashboardLayout>
                ) : (
                    <Redirect
                        to={{ pathname: '/login', state: { from: matchProps.location.pathname } }}
                    />
                );
            }}
        />
    );
};

const mapStateToProps = state => {
    return {
        isAuthenticated: getIsAuthenticated(state)
    };
};

export default connect(mapStateToProps)(DashboardRoute);

LoginPage

 onLogin = ({ username, password }) => {
        this.setState({ isLoading: true });
        this.props.login(username, password).then(({ payload: sessionData }) => {
            this.setState({ isLoading: false });

            const profileData = sessionData.role;
            const defaultRedirectUrl = getRedirectUrlByUserRole(profileData);

            // Check if the state of the location has the from defined, if so we should redirect to that instead
            const { location } = this.props
            const { state: locationState = {} } = location
            const { from = {} } = locationState

            // Reset the location state for the login page, before redirect
            const { from: fromLocation, ...newState } = locationState
            this.props.history.replace({ 
                ...this.props.location.pathname, 
                state: {} 
            })
                        
            if (from && from !== '' && from !== '/') {
                const redirectUrl = typeof from === 'string' ? from : defaultRedirectUrl

                this.props.history.push(redirectUrl, {
                    from: null,
                });
            } else {
                this.props.history.push(defaultRedirectUrl, {
                    from: null,
                });
            }
        }).catch((err) => {
            this.setState({ isLoading: false });
            console.error(err);
        });
    };