From 3c0f35ee44dec6a14afe8bfa9e27f075861a4fde Mon Sep 17 00:00:00 2001
From: Pontus Abrahamsson <pontus@lostisland.co>
Date: Tue, 19 Nov 2024 22:13:49 +0100
Subject: [PATCH] Revert auth

---
 .../supabase/src/queries/cached-queries.ts    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/supabase/src/queries/cached-queries.ts b/packages/supabase/src/queries/cached-queries.ts
index 8375fad157..136199948b 100644
--- a/packages/supabase/src/queries/cached-queries.ts
+++ b/packages/supabase/src/queries/cached-queries.ts
@@ -61,25 +61,23 @@ export const getTransactions = async (
     },
     ["transactions", teamId],
     {
-      revalidate: 600,
+      revalidate: 180,
       tags: [`transactions_${teamId}`],
     },
   )(params);
 };
 
-// Cache per request
 export const getSession = cache(async () => {
   const supabase = createClient();
 
-  return supabase.auth.getUser();
+  return supabase.auth.getSession();
 });
 
-// Cache per request and revalidate every 30 minutes
-export const getUser = cache(async () => {
+export const getUser = async () => {
   const {
-    data: { user },
+    data: { session },
   } = await getSession();
-  const userId = user?.id;
+  const userId = session?.user?.id;
 
   if (!userId) {
     return null;
@@ -94,11 +92,10 @@ export const getUser = cache(async () => {
     ["user", userId],
     {
       tags: [`user_${userId}`],
-      // 30 minutes, jwt expires in 1 hour
-      revalidate: 1800,
+      revalidate: 180,
     },
-  )();
-});
+  )(userId);
+};
 
 export const getTeamUser = async () => {
   const supabase = createClient();
@@ -114,7 +111,7 @@ export const getTeamUser = async () => {
     ["team", "user", data.id],
     {
       tags: [`team_user_${data.id}`],
-      revalidate: 1800,
+      revalidate: 180,
     },
   )(data.id);
 };
@@ -352,7 +349,7 @@ export const getTrackerProjects = async (
     ["tracker_projects", teamId],
     {
       tags: [`tracker_projects_${teamId}`],
-      revalidate: 3600,
+      revalidate: 180,
     },
   )(params);
 };
@@ -375,7 +372,7 @@ export const getTrackerRecordsByRange = async (
     ["tracker_entries", teamId],
     {
       tags: [`tracker_entries_${teamId}`],
-      revalidate: 3600,
+      revalidate: 180,
     },
   )(params);
 };
@@ -600,7 +597,7 @@ export const getTags = async () => {
     ["tags", teamId],
     {
       tags: [`tags_${teamId}`],
-      revalidate: 3600,
+      revalidate: 180,
     },
   )();
 };