Testing new supabase structure

src/actions/get-profile.ts

@@ -0,0 +1,19 @@
+"use server";
+
+import createClient from "@/lib/supa";
+
+export async function getProfileById(id: string) {
+  const supabase = await createClient();
+
+  const { error, data } = await supabase
+    .from("profiles")
+    .select("id, username, display_name, avatar_url, node_address")
+    .eq("id", id)
+    .maybeSingle();
+
+  if (error) {
+    throw error;
+  }
+
+  return data;
+}

src/actions/get-session.ts

@@ -0,0 +1,14 @@
+"use server";
+
+import createClient from "@/lib/supa";
+
+export default async function getSession() {
+  const supabase = await createClient();
+  const { error, data } = await supabase.auth.getSession();
+
+  if (error) {
+    throw error;
+  }
+
+  return data.session?.user.id;
+}

src/actions/login-server.ts

@@ -0,0 +1,18 @@
+"use server";
+
+import createClient from "@/lib/supa";
+
+export default async function loginServer(email: string, password: string) {
+  const supabase = await createClient();
+
+  const { data, error } = await supabase.auth.signInWithPassword({
+    email,
+    password,
+  });
+
+  if (error) {
+    throw new Error(error.message);
+  }
+
+  return data.user;
+}

src/app/auth/Login.tsx

@@ -2,32 +2,25 @@
 
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
-import axios from "axios";
 import { useState } from "react";
-import Cookies from "js-cookie";
 import { useRouter } from "next/navigation";
 import { CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import loginServer from "@/actions/login-server";
+
+type Feedback = { kind: "error" | "info"; message: string };
 
 export default function Login() {
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
-  const [feedback, setFeedback] = useState<
-    undefined | { kind: "error" | "info"; message: string }
-  >();
+  const [feedback, setFeedback] = useState<Feedback>();
 
   const router = useRouter();
 
   const login = async () => {
-    localStorage.removeItem("chat-messages");
-    localStorage.removeItem("server-messages");
     setFeedback(undefined);
     try {
-      const res = await axios.get("/api/user", {
-        params: { email, password },
-      });
+      const res = await loginServer(email, password);
 
-      Cookies.set("token", (res.data as any).token);
-      Cookies.set("refresh_token", (res.data as any).refresh_token);
       setFeedback({
         kind: "info",
         message: "Login successful! Redirecting...",

src/hooks/get-user.ts

@@ -7,6 +7,8 @@ import { useEffect, useState } from "react";
 import { get } from "@/lib/request";
 import { toast } from "sonner";
 import axios from "axios";
+import getSession from "@/actions/get-session";
+import { getProfileById } from "@/actions/get-profile";
 
 export interface UserProfile extends ProfileSettings {
   id: string;
@@ -19,20 +21,15 @@ export default function useUser() {
   useEffect(() => {
     async function fetchUser() {
       try {
-        setUser((await get("/api/profile", (r) => setUser(r.data))).data);
-      } catch (e: any) {
-        try {
-          console.log("Failed to obtain current user, refreshing token..");
-          const refresh = await axios.put("/api/auth/");
-          const { access_token, refresh_token } = refresh.data as any;
-          Cookies.set("token", access_token);
-          Cookies.set("refresh_token", refresh_token);
-
-          setUser((await get("/api/profile", (r) => setUser(r.data))).data);
-        } catch (e: any) {
-          router.push("/auth?t=login");
-          toast.error(`Error: ${e}`);
+        const user_id = await getSession();
+        if (!user_id) {
+          throw new Error("Session user id is not valid");
         }
+
+        setUser(await getProfileById(user_id));
+      } catch (e: any) {
+        router.push("/auth?t=login");
+        toast.error(`Error: ${e}`);
       }
     }
 

src/lib/supa.ts

@@ -0,0 +1,24 @@
+import { cookies } from "next/headers";
+import { createServerClient } from "@supabase/ssr";
+
+export default async function createClient() {
+  const cookieStore = await cookies();
+
+  return createServerClient(
+    process.env.NEXT_PUBLIC_SUPABASE_URL!,
+    process.env.SUPABASE_SERVICE_ROLE_KEY!,
+    {
+      cookies: {
+        get(name) {
+          return cookieStore.get(name)?.value;
+        },
+        set(name, value) {
+          cookieStore.set(name, value);
+        },
+        remove(name) {
+          cookieStore.delete(name);
+        },
+      },
+    }
+  );
+}