From 4168562d6c45c0999c5c7801db5b644c94ae30f3 Mon Sep 17 00:00:00 2001 From: Nik Graf Date: Thu, 4 Jul 2024 20:02:34 +0200 Subject: [PATCH] fix --- apps/app/src/hooks/useLogin/useLogin.ts | 19 +++++++++++++------ apps/app/vercel.json | 4 ++++ apps/server/src/trpc/trpc.ts | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/apps/app/src/hooks/useLogin/useLogin.ts b/apps/app/src/hooks/useLogin/useLogin.ts index d3fb688..d225333 100644 --- a/apps/app/src/hooks/useLogin/useLogin.ts +++ b/apps/app/src/hooks/useLogin/useLogin.ts @@ -38,6 +38,7 @@ export const useLogin = () => { if (document.hasStorageAccess) { document.hasStorageAccess().then(async (hasAccess) => { + console.log("LALA", hasAccess); if (!hasAccess) { document .requestStorageAccess() @@ -60,14 +61,19 @@ export const useLogin = () => { } else { // Storage access already granted console.log("wow2"); - const { success } = await loginFinishMutation.mutateAsync({ - finishLoginRequest, - userIdentifier, - }); + try { + const { success } = await loginFinishMutation.mutateAsync({ + finishLoginRequest, + userIdentifier, + }); - queryClient.invalidateQueries(); + queryClient.invalidateQueries(); - return success ? sessionKey : null; + return success ? sessionKey : null; + } catch (error) { + console.log("error2", error); + return null; + } } }); } else { @@ -75,6 +81,7 @@ export const useLogin = () => { console.log("Browser does not support Storage Access API."); } } catch (error) { + console.log("error", error); return null; } finally { setIsPending(false); diff --git a/apps/app/vercel.json b/apps/app/vercel.json index 1323cda..f0ca0b9 100644 --- a/apps/app/vercel.json +++ b/apps/app/vercel.json @@ -1,5 +1,9 @@ { "rewrites": [ + { + "source": "/api/:match*", + "destination": "https://automerge-jumpstart.fly.dev/:match*" + }, { "source": "/(.*)", "destination": "/index.html" diff --git a/apps/server/src/trpc/trpc.ts b/apps/server/src/trpc/trpc.ts index bfa736e..fd91a6b 100644 --- a/apps/server/src/trpc/trpc.ts +++ b/apps/server/src/trpc/trpc.ts @@ -21,7 +21,7 @@ export const createContext = async ({ ? { secure: true, sameSite: "none", - // partitioned: true, + partitioned: true, } : { secure: false,