Merge branch 'main' of https://github.com/john-david3/cs3305-team11

2025-02-12 00:49:12 +00:00
parent e5da7f63a2 1b167b60f1
commit f162c32abd
5 changed files with 20 additions and 4 deletions
--- a/frontend/src/components/Auth/OAuth.tsx
+++ b/frontend/src/components/Auth/OAuth.tsx
@@ -3,7 +3,8 @@ import { useEffect } from "react";
 export default function GoogleLogin() {
  const handleLoginClick = (e: React.MouseEvent<HTMLButtonElement>) => {
    e.preventDefault();
-    window.location.href = "/api/login/google";
+    const nextUrl = encodeURIComponent(window.location.href);
+    window.location.href = `/api/login/google?next=${nextUrl}`;
  };

  return (