Minor modifications in google callback URL

sikehish · Jun 10, 2024 · 78c74e5 · 78c74e5
1 parent 888c596
commit 78c74e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/backend/routes/oauthRouter.ts b/backend/routes/oauthRouter.ts
@@ -28,9 +28,11 @@ router.get('/google/callback', passport.authenticate('google', { session: false,
     });
 
     // Redirect to the success URL
-    res.redirect(`${process.env.CLIENT_URL}/success`);
+    if(proces.env.NODE_ENV=="aws-eb")  res.redirect(`/success`);
+    else res.redirect(`${process.env.CLIENT_URL}/success`);
   } else {
     // Redirect to the failure URL
+    f(proces.env.NODE_ENV=="aws-eb")  res.redirect(`/failed`);
     res.redirect(`${process.env.CLIENT_URL}/failed`);
   }
 });

diff --git a/frontend/src/pages/auth/Login.tsx b/frontend/src/pages/auth/Login.tsx
@@ -17,14 +17,13 @@ function Login() {
   };
 
   console.log(import.meta.env.VITE_REACT_APP_API_URL)
-
+  
   const googleAuth = (e: any) => {
     e.preventDefault()
-		// window.open(
-		// 	`http://localhost:3000/api/oauth/google/callback`,
-		// 	"_self"
-		// );
-    window.location="http://langjam.us-east-1.elasticbeanstalk.com/api/oauth/google/callback"
+		window.open(
+			`/api/oauth/google/callback`,
+			"_self"
+		);
 	};
   // // OR   //--> The below is returning undefined in Elastic Beanstalk
   // const googleAuth = (e: any) => {