voyage canada

hooks/useUser.ts

@@ -8,8 +8,6 @@ import { User } from "@/types";
 import MY_TOKEN_KEY from "@/lib/get-cookie-name";
 import { api } from "@/lib/api";
 import { toast } from "sonner";
-import { getAuthCookieOptions, getIframeCookieOptions, getRemoveCookieOptions } from "@/lib/cookie-options";
-
 
 export const useUser = (initialData?: {
   user: User | null;
@@ -18,7 +16,7 @@ export const useUser = (initialData?: {
   const cookie_name = MY_TOKEN_KEY();
   const client = useQueryClient();
   const router = useRouter();
-  const [, setCookie] = useCookie(cookie_name);
+  const [, setCookie, removeCookie] = useCookie(cookie_name);
   const [currentRoute, setCurrentRoute] = useCookie("deepsite-currentRoute");
 
   const { data: { user, errCode } = { user: null, errCode: null }, isLoading } =
@@ -49,7 +47,7 @@ export const useUser = (initialData?: {
   };
 
   const openLoginWindow = async () => {
-    setCurrentRoute(window.location.pathname, getIframeCookieOptions());
+    setCurrentRoute(window.location.pathname);
     return router.push("/auth");
   };
 
@@ -60,14 +58,20 @@ export const useUser = (initialData?: {
       .post("/auth", { code })
       .then(async (res: any) => {
         if (res.data) {
-          setCookie(res.data.access_token, getAuthCookieOptions(res.data.expires_in));
+          setCookie(res.data.access_token, {
+            expires: res.data.expires_in
+              ? new Date(Date.now() + res.data.expires_in * 1000)
+              : undefined,
+            sameSite: "none",
+            secure: true,
+          });
           client.setQueryData(["user.me"], {
             user: res.data.user,
             errCode: null,
           });
           if (currentRoute) {
             router.push(currentRoute);
-            setCurrentRoute("", getIframeCookieOptions());
+            setCurrentRoute("");
           } else {
             router.push("/projects");
           }
@@ -83,7 +87,7 @@ export const useUser = (initialData?: {
   };
 
   const logout = async () => {
-    setCookie("", getRemoveCookieOptions());
+    removeCookie();
     router.push("/");
     toast.success("Logout successful");
     client.setQueryData(["user.me"], {

lib/cookie-options.ts

@@ -1,47 +0,0 @@
-// Cookie options for iframe compatibility using CHIPS (Cookies Having Independent Partitioned State)
-export interface IframeCookieOptions {
-  expires?: Date;
-  maxAge?: number;
-  sameSite?: "strict" | "lax" | "none";
-  secure?: boolean;
-  partitioned?: boolean;
-  domain?: string;
-  path?: string;
-}
-
-/**
- * Get cookie options optimized for iframe usage
- * Uses CHIPS (Cookies Having Independent Partitioned State) for cross-site cookie support
- */
-export function getIframeCookieOptions(
-  customOptions: Partial<IframeCookieOptions> = {}
-): IframeCookieOptions {
-  return {
-    sameSite: "none",
-    secure: true,
-    partitioned: true,
-    path: "/",
-    ...customOptions,
-  };
-}
-
-/**
- * Get cookie options for the auth token specifically
- */
-export function getAuthCookieOptions(expiresIn?: number): IframeCookieOptions {
-  return getIframeCookieOptions({
-    expires: expiresIn 
-      ? new Date(Date.now() + expiresIn * 1000)
-      : undefined,
-  });
-}
-
-/**
- * Get cookie options for removing iframe-compatible cookies
- * Sets the cookie to expire immediately while maintaining the same attributes
- */
-export function getRemoveCookieOptions(): IframeCookieOptions {
-  return getIframeCookieOptions({
-    expires: new Date(0), // Set to epoch time (expired)
-  });
-}