Move getSessionUserData to another file

Author: maparent

apps/website/app/components/auth/ListGroups.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { createClient } from "~/utils/supabase/client";
-import { getSessionUserData } from "~/utils/supabase/dbUtils";
+import { getSessionUserData } from "~/utils/supabase/account";
 import { useState, useEffect } from "react";
 import { Tables } from "@repo/database/dbTypes";
 import useInternalError from "~/utils/internalError";

apps/website/app/utils/supabase/account.ts

@@ -0,0 +1,46 @@
+import type { Database } from "@repo/database/dbTypes";
+import type { DGSupabaseClient } from "@repo/database/lib/client";
+
+type AgentType = Database["public"]["Enums"]["AgentType"] | "group";
+
+export const getSessionUserData = async (
+  client: DGSupabaseClient,
+): Promise<{
+  id: string;
+  name: string;
+  type: AgentType;
+  email?: string;
+} | null> => {
+  const session = await client.auth.getSession();
+  if (!session?.data?.session?.user) return null;
+  const { id, email } = session.data.session.user;
+  if (email) {
+    const [name, host] = email.split("@") as [string, string];
+    if (host === "database.discoursegraphs.com" && name.endsWith("-anon")) {
+      const parts = name.split("-");
+      const spaceId = Number.parseInt(parts[1]!);
+      const spaceReq = await client
+        .from("Space")
+        .select("name")
+        .eq("id", spaceId)
+        .maybeSingle();
+      if (spaceReq.error || !spaceReq.data) {
+        return null;
+      }
+      return { name: spaceReq.data.name, id, type: "anonymous", email };
+    }
+    if (host === "groups.discoursegraphs.com") {
+      return { name, id, email, type: "group" };
+    }
+  }
+  const accountReq = await client
+    .from("PlatformAccount")
+    .select("name")
+    .eq("dg_account", session.data.session.user.id)
+    .eq("agent_type", "person")
+    .maybeSingle();
+  if (accountReq.error || !accountReq.data) {
+    return null;
+  }
+  return { id, name: accountReq.data.name, type: "person", email };
+};

apps/website/app/utils/supabase/dbUtils.ts

@@ -5,9 +5,6 @@ import type {
 } from "@supabase/supabase-js";
 import { PostgrestError } from "@supabase/supabase-js";
 import type { Database } from "@repo/database/dbTypes";
-import type { DGSupabaseClient } from "@repo/database/lib/client";
-
-type AgentType = Database["public"]["Enums"]["AgentType"] | "group";
 
 type PublicTableName = keyof Database["public"]["Tables"];
 type RawTables<TN extends PublicTableName> =
@@ -508,45 +505,3 @@ export const processAndInsertBatch = async <
   }
   return { ...result, data: processedResults };
 };
-
-export const getSessionUserData = async (
-  client: DGSupabaseClient,
-): Promise<{
-  id: string;
-  name: string;
-  type: AgentType;
-  email?: string;
-} | null> => {
-  const session = await client.auth.getSession();
-  if (!session?.data?.session?.user) return null;
-  const { id, email } = session.data.session.user;
-  if (email) {
-    const [name, host] = email.split("@") as [string, string];
-    if (host === "database.discoursegraphs.com" && name.endsWith("-anon")) {
-      const parts = name.split("-");
-      const spaceId = Number.parseInt(parts[1]!);
-      const spaceReq = await client
-        .from("Space")
-        .select("name")
-        .eq("id", spaceId)
-        .maybeSingle();
-      if (spaceReq.error || !spaceReq.data) {
-        return null;
-      }
-      return { name: spaceReq.data.name, id, type: "anonymous", email };
-    }
-    if (host === "groups.discoursegraphs.com") {
-      return { name, id, email, type: "group" };
-    }
-  }
-  const accountReq = await client
-    .from("PlatformAccount")
-    .select("name")
-    .eq("dg_account", session.data.session.user.id)
-    .eq("agent_type", "person")
-    .maybeSingle();
-  if (accountReq.error || !accountReq.data) {
-    return null;
-  }
-  return { id, name: accountReq.data.name, type: "person", email };
-};