Merge branch 'main' of https://github.com/Luxshan2000/drivers-license…

…-test-application
Luxshan2000 · Nov 1, 2023 · 4358c71 · 4358c71
2 parents cecd850 + 84df1bd
commit 4358c71
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/backend/server.js b/backend/server.js
@@ -18,7 +18,7 @@ const PORT = process.env.PORT || 5000;
 
 app.use(
   cors({
-    origin: ["http://18.61.20.118:3000", "http://18.61.20.118:3001","*","http://18.61.20.118", "https://drivesmart-w549.onrender.com/","http://drivesmart.tracktechlk.com","http://localhost:3000"],
+    origin: ["http://18.61.20.118:3000", "http://18.61.20.118:3001","*","http://18.61.20.118", "https://drivesmart-w549.onrender.com","http://drivesmart.tracktechlk.com","http://localhost:3000"],
     methods: ["POST", "GET"],
     credentials: true,
   })

diff --git a/backend/src/controllers/authController.js b/backend/src/controllers/authController.js
@@ -148,7 +148,9 @@ const googleLoginBase = async (req, res, isWeb) => {
           Authorization: `Bearer ${token}`,
         },
       }
-    )
+    ).catch(err => {
+      console.log(err)
+    })
     console.log(googleResponse.data);
     const { email, name } = googleResponse.data;
     //see if there is an user with that email already

diff --git a/webapp/src/components/GoogleLoginButton.js b/webapp/src/components/GoogleLoginButton.js
@@ -15,8 +15,10 @@ function GoogleLoginButton() {
         axios.post(url, { token: response.access_token })
             .then(response => {
                 // Handle the successful response here
-                console.log(response.data);
+                // console.log(response.data);
                 // alert('login successful')
+                localStorage.setItem('token' , response.newToken)
+                console.log(response.newToken)
                 navigate('/dashboard',{replace : true})
             })
             .catch(error => {