ui: fix redirect to next on login

* redirect was borken after change to popup window
* closes #2046

Signed-off-by: Pamfilos Fokianos <[email protected]>

Author: pamfilos

ui/cap-react/src/components/settings/components/OAuthPopup.js

@@ -5,8 +5,11 @@ import PropTypes from "prop-types";
 export default class OauthPopup extends React.PureComponent {
   constructor(props) {
     super(props);
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+
     window["loginCallBack"] = function() {
-      if (props.loginCallBack) props.loginCallBack();
+      if (props.loginCallBack) props.loginCallBack(urlParams.get('next'));
       return null;
     };
   }
@@ -34,3 +37,4 @@ OauthPopup.propTypes = {
   url: PropTypes.string,
   loginCallBack: PropTypes.func
 };
+

ui/cap-react/src/components/welcome/Header.js

@@ -37,13 +37,10 @@ class WelcomePage extends React.Component {
     };
   }
 
-  loginCallBack = () => {
-    // const path = this.props.location.pathname;
-    let {
-      location: { state: { next: next = undefined } = {} }
-    } = this.props.history;
+  loginCallBack = (next) => {
     this.props.initCurrentUser(next);
   };
+
   onFormSubmit = formData => {
     // fetch the next from history
     formData["next"] = this.state.next;