asd

backend/server.js

@@ -71,9 +71,9 @@ app.get('/callback', function (req, res) {
     let uri = process.env.FRONTEND_URI || 'http://localhost:3000/'
     uri= uri + '?access_token=' + access_token
     console.log(req.query.state);
-    if (req.query.state.hasOwnProperty('from')){
+    if (req.query.state){
       console.log("sdfdfdf")
-      uri=uri+`&from=${req.query.state.from}`
+      uri=uri+`&from=${encodeURI(req.query.state)}`
     }
     console.log(uri);
     res.redirect(uri)

frontend/src/components/layout/Landing.js

@@ -9,17 +9,24 @@ class Landing extends Component{
         if(this.props.auth.isAuthenticated){
             this.props.history.push(`/`);
         } else {
-            const {access_token} = queryString.parse(window.location.search);
+            const {access_token,from} = queryString.parse(window.location.search);
+            console.log(access_token + "     "+ from);
             if (access_token) this.props.loginUser(access_token);
         }
     }
 
     componentWillReceiveProps(nextProps){
-        console.log(this.props)
-      console.log(nextProps)
-        // if(nextProps.auth.isAuthenticated){
-        //     this.props.history.push('/dashboard');
-        // }
+         const {from} = queryString.parse(window.location.search);
+         if(nextProps.auth.isAuthenticated)
+         {
+             if(from){
+               this.props.history.push('/'+decodeURI(from));
+             }else{
+               this.props.history.push('/dashboard');
+             }
+
+
+        }
     }
 
     render(){