From 367f92630caec9bfe73b8ba9b55ce1126a613945 Mon Sep 17 00:00:00 2001
From: kutaysaran <74209499+kutaysaran@users.noreply.github.com>
Date: Thu, 9 Nov 2023 23:31:47 +0300
Subject: [PATCH 1/2] Google Sign in

---
 .../frontend/src/Pages/Auth/Google/index.jsx  | 35 +++++++++++++++++++
 .../frontend/src/Pages/Auth/SignIn/index.jsx  |  8 +++--
 .../frontend/src/Routes/Router.jsx            |  4 +++
 .../frontend/src/api/requests/googleLogin.jsx | 25 +++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 prediction-polls/frontend/src/Pages/Auth/Google/index.jsx
 create mode 100644 prediction-polls/frontend/src/api/requests/googleLogin.jsx

diff --git a/prediction-polls/frontend/src/Pages/Auth/Google/index.jsx b/prediction-polls/frontend/src/Pages/Auth/Google/index.jsx
new file mode 100644
index 00000000..13ced48b
--- /dev/null
+++ b/prediction-polls/frontend/src/Pages/Auth/Google/index.jsx
@@ -0,0 +1,35 @@
+import React, { useEffect } from 'react';
+import { useLocation } from 'react-router-dom';
+import googleLogin from '../../../api/requests/googleLogin';
+
+function GoogleLogin() {
+  const location = useLocation();
+
+  useEffect(() => {
+    const code = new URLSearchParams(location.search).get('code');
+    console.log(code);
+    if (code) {
+      // Call the googleLogin function with the code
+      googleLogin(code).then(success => {
+        if (success) {
+          // Redirect to home page or dashboard if login was successful
+          console.log('Logged in successfully');
+          // Replace with your path to redirect
+          // this could be using history.push('/path') if you're using react-router
+        } else {
+          // Handle the error scenario, maybe set an error message state and display it
+          console.error('Failed to log in with Google');
+        }
+      });
+    }
+  }, [location]);
+
+  return (
+    <div>
+      <h1>Google Login Page</h1>
+      {/* Render additional UI elements or messages here if needed */}
+    </div>
+  );
+}
+
+export default GoogleLogin;
diff --git a/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx b/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
index 3defd3a1..869b6595 100644
--- a/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Auth/SignIn/index.jsx
@@ -86,12 +86,16 @@ const messageStyle = {
   color: "#FC1612"
 }
 
+
 function SignIn() {
   const [passwordVisible, setPasswordVisible] = React.useState(false);
   const [username, setUsername] = React.useState("");
   const [password, setPassword] = React.useState("");
   const [message, setMessage] = React.useState("");
   const navigate = useNavigate();
+  const handleLogin = () => {
+    window.location.href = getGoogleOAuthURL();
+  };
 
   const handleSignIn = async (e) => {
     e.preventDefault();
@@ -104,7 +108,7 @@ function SignIn() {
           password: password
         })
       };
-      const response = await fetch(process.env.REACT_APP_BACKEND_LINK+'/login', requestOptions);
+      const response = await fetch(process.env.REACT_APP_BACKEND_LINK+'/auth/login', requestOptions);
       const data = await response.json();
     
     if (response.status === 201 && data.accessToken && data.refreshToken) {
@@ -128,7 +132,7 @@ function SignIn() {
         <Form {...formItemLayout}>
           <Form.Item>
             <div>
-              <Button style={formButtonStyle} onClick={() => window.location.href = getGoogleOAuthURL()}>
+              <Button style={formButtonStyle} onClick={handleLogin}>
                 <GoogleLogo style={googleLogoStyle} />
 
                 <span>Sign In with Google</span>
diff --git a/prediction-polls/frontend/src/Routes/Router.jsx b/prediction-polls/frontend/src/Routes/Router.jsx
index 787f1b67..c40b526e 100644
--- a/prediction-polls/frontend/src/Routes/Router.jsx
+++ b/prediction-polls/frontend/src/Routes/Router.jsx
@@ -12,6 +12,7 @@ import Profile from '../Pages/Profile';
 import Settings from '../Pages/Settings';
 import Vote from '../Pages/Vote';
 import PrivateRoute from '../Components/PrivateRoute';
+import GoogleLogin from '../Pages/Auth/Google'
 
 function AppRouter() {
   return (
@@ -28,6 +29,9 @@ function AppRouter() {
         <Route path="/feed" element={
           <PrivateRoute><Feed /></PrivateRoute>
         } />
+        <Route path="/googleAuth" element={
+          <GoogleLogin />
+        } />
         <Route path="/create" element={
           <PrivateRoute><Create /></PrivateRoute>
         } />
diff --git a/prediction-polls/frontend/src/api/requests/googleLogin.jsx b/prediction-polls/frontend/src/api/requests/googleLogin.jsx
new file mode 100644
index 00000000..6b91f39a
--- /dev/null
+++ b/prediction-polls/frontend/src/api/requests/googleLogin.jsx
@@ -0,0 +1,25 @@
+// authService.js
+const baseUrl = process.env.REACT_APP_BACKEND_LINK; // Replace with your actual base URL
+
+async function googleLogin(code) {
+  try {
+    const response = await fetch(`${baseUrl}/auth/google`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ 'code': code })
+    });
+
+    if (response.ok) {
+      // Clear access token and refresh token from local storage (or wherever you've stored them)
+      
+      console.log('success')
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    return false;
+  }
+}
+
+export default googleLogin;

From 741ff7828a37dca4f4a9f33deaf01ee74a210e06 Mon Sep 17 00:00:00 2001
From: kutaysaran <74209499+kutaysaran@users.noreply.github.com>
Date: Tue, 14 Nov 2023 16:53:20 +0300
Subject: [PATCH 2/2] Google Sign In

Google sign in is implemented.
---
 .../frontend/src/Pages/Auth/Google/index.jsx  | 32 ++++++++-----------
 .../frontend/src/api/requests/googleLogin.jsx | 19 +++++------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/prediction-polls/frontend/src/Pages/Auth/Google/index.jsx b/prediction-polls/frontend/src/Pages/Auth/Google/index.jsx
index 13ced48b..d2b0f8a9 100644
--- a/prediction-polls/frontend/src/Pages/Auth/Google/index.jsx
+++ b/prediction-polls/frontend/src/Pages/Auth/Google/index.jsx
@@ -1,33 +1,29 @@
 import React, { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router-dom';
 import googleLogin from '../../../api/requests/googleLogin';
 
 function GoogleLogin() {
+  const navigate = useNavigate();
   const location = useLocation();
 
   useEffect(() => {
     const code = new URLSearchParams(location.search).get('code');
-    console.log(code);
-    if (code) {
-      // Call the googleLogin function with the code
-      googleLogin(code).then(success => {
-        if (success) {
-          // Redirect to home page or dashboard if login was successful
-          console.log('Logged in successfully');
-          // Replace with your path to redirect
-          // this could be using history.push('/path') if you're using react-router
-        } else {
-          // Handle the error scenario, maybe set an error message state and display it
-          console.error('Failed to log in with Google');
-        }
-      });
+      if (code) {
+        googleLogin(code).then(success => {
+          if (success) {
+            // Redirect to profile if login was successful
+            navigate('/profile');
+          } else {
+            // Redirect to a login error page or back to login
+            navigate('/auth/sign-in');
+          }
+        });
     }
-  }, [location]);
+  }, [location.search, navigate]);
 
   return (
     <div>
-      <h1>Google Login Page</h1>
-      {/* Render additional UI elements or messages here if needed */}
+      <h1>Redirecting..</h1>
     </div>
   );
 }
diff --git a/prediction-polls/frontend/src/api/requests/googleLogin.jsx b/prediction-polls/frontend/src/api/requests/googleLogin.jsx
index 6b91f39a..a6cf6e3f 100644
--- a/prediction-polls/frontend/src/api/requests/googleLogin.jsx
+++ b/prediction-polls/frontend/src/api/requests/googleLogin.jsx
@@ -1,6 +1,4 @@
-// authService.js
-const baseUrl = process.env.REACT_APP_BACKEND_LINK; // Replace with your actual base URL
-
+const baseUrl = process.env.REACT_APP_BACKEND_LINK;
 async function googleLogin(code) {
   try {
     const response = await fetch(`${baseUrl}/auth/google`, {
@@ -8,18 +6,17 @@ async function googleLogin(code) {
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ 'code': code })
     });
-
-    if (response.ok) {
-      // Clear access token and refresh token from local storage (or wherever you've stored them)
-      
-      console.log('success')
-      return true;
+    const data = await response.json();
+    if (response.status === 200 && data.accessToken && data.refreshToken) {
+      localStorage.setItem('accessToken', data.accessToken); 
+      localStorage.setItem('refreshToken', data.refreshToken);
+      return { success: true };
     } else {
-      return false;
+      return { success: false };
     }
   } catch (error) {
     return false;
   }
 }
 
-export default googleLogin;
+export default googleLogin;
\ No newline at end of file