fix: Using UI to set the cookie instead of server.
This commit is contained in:
parent
3ad2c93448
commit
bacb070e6d
@ -4,7 +4,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
@ -32,12 +31,13 @@ func (s *Server) GoogleCallbackHandlerV2(ctx *gin.Context) {
|
|||||||
domain := s.deps.EnvironmentConfig.FrontendDomain
|
domain := s.deps.EnvironmentConfig.FrontendDomain
|
||||||
|
|
||||||
if jwt, err := s.deps.AuthService.GoogleAuthSuccess(state, code); err != nil {
|
if jwt, err := s.deps.AuthService.GoogleAuthSuccess(state, code); err != nil {
|
||||||
url := fmt.Sprintf("%s/v2/web/login?error=%s", domain, url.QueryEscape(err.Error()))
|
redirectUrl := fmt.Sprintf("%s/v2/web/login?error=%s", domain, url.QueryEscape(err.Error()))
|
||||||
ctx.Redirect(http.StatusSeeOther, url)
|
ctx.Redirect(http.StatusSeeOther, redirectUrl)
|
||||||
} else {
|
} else {
|
||||||
url := fmt.Sprintf("%s/v2/web/home", domain)
|
// Pass JWT via query param - frontend will set the cookie
|
||||||
s.SetCookie(ctx, "jwt_token", jwt, time.Hour*24*7)
|
// This bypasses cross-origin cookie issues with Cloudflare/proxies
|
||||||
ctx.Redirect(http.StatusSeeOther, url)
|
redirectUrl := fmt.Sprintf("%s/v2/web/auth/callback?token=%s", domain, url.QueryEscape(jwt))
|
||||||
|
ctx.Redirect(http.StatusSeeOther, redirectUrl)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,7 @@ import { use, type ReactNode } from 'react';
|
|||||||
import { AuthContext } from './context/AuthContext';
|
import { AuthContext } from './context/AuthContext';
|
||||||
import RecipePage from './pages/Recipe';
|
import RecipePage from './pages/Recipe';
|
||||||
import SearchPage from './pages/Search';
|
import SearchPage from './pages/Search';
|
||||||
|
import AuthCallback from './pages/AuthCallback';
|
||||||
|
|
||||||
function ProtectedRoute({ children }: { children: ReactNode }) {
|
function ProtectedRoute({ children }: { children: ReactNode }) {
|
||||||
const { isLoggedIn } = use(AuthContext)
|
const { isLoggedIn } = use(AuthContext)
|
||||||
@ -37,6 +38,9 @@ function App() {
|
|||||||
{/* Login page does not inherit WebLayout */}
|
{/* Login page does not inherit WebLayout */}
|
||||||
<Route path="/v2/web/login" element={<LoginPage />} />
|
<Route path="/v2/web/login" element={<LoginPage />} />
|
||||||
|
|
||||||
|
{/* Auth callback - handles token from OAuth redirect */}
|
||||||
|
<Route path="/v2/web/auth/callback" element={<AuthCallback />} />
|
||||||
|
|
||||||
<Route path="/v2/web" element={<WebLayout />}>
|
<Route path="/v2/web" element={<WebLayout />}>
|
||||||
<Route index element={<Navigate to={ROUTE_CONSTANTS.Home} replace />} />
|
<Route index element={<Navigate to={ROUTE_CONSTANTS.Home} replace />} />
|
||||||
<Route path="home" element={<Home />} />
|
<Route path="home" element={<Home />} />
|
||||||
|
|||||||
29
web/src/pages/AuthCallback.tsx
Normal file
29
web/src/pages/AuthCallback.tsx
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
import { useEffect } from "react";
|
||||||
|
import { useSearchParams, useNavigate } from "react-router-dom";
|
||||||
|
import { useCookies } from "react-cookie";
|
||||||
|
|
||||||
|
export default function AuthCallback() {
|
||||||
|
const [searchParams] = useSearchParams();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const [, setCookie] = useCookies(["jwt_token"]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const token = searchParams.get("token");
|
||||||
|
|
||||||
|
if (token) {
|
||||||
|
// Set cookie with 7 day expiration, accessible across all subdomains
|
||||||
|
setCookie("jwt_token", token, {
|
||||||
|
path: "/",
|
||||||
|
maxAge: 60 * 60 * 24 * 7, // 7 days in seconds
|
||||||
|
secure: true,
|
||||||
|
sameSite: "lax",
|
||||||
|
});
|
||||||
|
void navigate("/v2/web/home", { replace: true });
|
||||||
|
} else {
|
||||||
|
// No token provided, redirect to login
|
||||||
|
void navigate("/v2/web/login", { replace: true });
|
||||||
|
}
|
||||||
|
}, [searchParams, setCookie, navigate]);
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user