google oauth signin and token saving

SummySumanth · Jan 22, 2019 · 29620b3 · 29620b3
1 parent 61908fb
commit 29620b3
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 16 deletions.
diff --git a/passport.js b/passport.js
@@ -34,7 +34,6 @@ passport.use('googleToken',new googlePlusTokenStrategy({
     clientID : OAuth.google.clientID,
     clientSecret  : OAuth.google.clientSecret
 }, async (accessToken, refreshToken, profile, done)=>{
-    console.log('reached goooooogle');
     try{
         const existingUser = await User.findOne({"google.id": profile.id});
         if(existingUser){

diff --git a/routes/api/user.js b/routes/api/user.js
@@ -28,13 +28,12 @@ module.exports = {
 
     },
     googleOAuth : async(req, res, next)=>{
-        console.log('reached google o auth ');
         const token = signToken(req.user, JWT_SECRET);
-        res.status(200).json({ token });
+        res.status(200).json({ token, redirect: '/home'});
     },
     facebookOAuth : async(req, res, next)=>{
         const token = signToken(req.user, JWT_SECRET);
-        res.status(200).json( {token} );
+        res.status(200).json( {token, redirect: '/home'} );
     },
     signinUser: async(req, res, next) =>{
         const token = signToken(req.user, JWT_SECRET);

diff --git a/view/js/actions/auth/auth.js b/view/js/actions/auth/auth.js
@@ -1,5 +1,6 @@
 import {signin} from '../../services/signin/signin';
-
+import auth from '../../services/auth/auth';
+import history from '../../routes/history';
 const AuthActionTypes = {
     TOKEN_RECEIVED : 'TOKEN_RECEIVED',
     INVALID_USER : 'INVALID_USER',
@@ -18,7 +19,13 @@ const AuthActions = {
     invalidUser: (token) => ({type: AuthActionTypes.INVALID_USER, payload: token}),
 
     googleOAuth: (data) => (dispatch) =>{
-        console.log('action received access token', data);
+        let payload = {
+            access_token : data
+        }
+        auth.googleSignin(payload).then(response=>{
+            dispatch(AuthActions.tokenReceived(response.data.token));
+            history.push(response.data.redirect);
+        })
     },
 
     tokenValidity: () =>{

diff --git a/view/js/components/landingPage/signinContainer.jsx b/view/js/components/landingPage/signinContainer.jsx
@@ -26,15 +26,14 @@ class Signin extends Component{
         if(errObj){
             return(
                 <div>
-                    INVALID USERNAME OR PASSWORD changed
+                    INVALID USERNAME OR PASSWORD
                 </div>
             );
         }
 
     }
 
     responseGoogle(response){
-        console.loh('reached response');
         console.log('google response : ', response);
         this.props.dispatch(AuthActions.googleOAuth(response.accessToken));
     }
@@ -55,8 +54,8 @@ class Signin extends Component{
                             render={renderProps => (
                                 <img class='lnf-LPcard-content-body-signin-social-logo' src='/assets/images/google.png'  onClick={renderProps.onClick} />
                                 )}
-                            onSuccess={()=>this.responseGoogle}
-                            onFailure={()=>this.responseGoogle}
+                            onSuccess={(data)=>this.responseGoogle(data)}
+                            onFailure={(data)=>this.responseGoogle(data)}
                         />
                         <FacebookLogin
                             appId="273464073501603"

diff --git a/view/js/services/auth/auth.js b/view/js/services/auth/auth.js
@@ -1,5 +1,20 @@
-// import {raiseStatus} from '../../scripts/https';
+import {raiseStatus} from '../../scripts/https';
+import axios from 'axios';
+import axiosConfig from '../../config/axiosServices';
 
-// export {
-
-// }
+const auth = {
+    googleSignin : (payload) =>  axios
+                                    .post('/api/oauth/google', payload)
+                                    .then(raiseStatus)
+                                    .catch(err=>{
+                                        console.log('error was found at service,', err);
+                                    }),
+    facebookSignin : (payload) => axios
+                                    .post('/api/signin', payload)
+                                    .then(raiseStatus)
+                                    .catch(err=>{
+                                        console.log('error was found at service,', err);
+                                    }),
+}
+
+export default auth;
diff --git a/view/js/services/signin/signin.js b/view/js/services/signin/signin.js
@@ -3,7 +3,7 @@ import axios from 'axios';
 import axiosConfig from '../../config/axiosServices';
 
 const signin = (payload) => axios
-                                .post('/api/signin', payload, axiosConfig)
+                                .post('/api/signin', payload)
                                 .then(raiseStatus)
                                 .catch(err=>{
                                     console.log('error was found at service,', err);

diff --git a/view/js/services/signup/signup.js b/view/js/services/signup/signup.js
@@ -3,7 +3,7 @@ import axios from 'axios';
 import axiosConfig from '../../config/axiosServices';
 
 const signup = (payload) => axios
-                                .post('/api/signup', payload ,axiosConfig)
+                                .post('/api/signup', payload)
                                 .then(raiseStatus)
                                 .catch(err=>{
                                     console.log('error was found at service,', err);