From 49b1ea39b3d8428f0978312c68a6d7ed1cf04150 Mon Sep 17 00:00:00 2001
From: Anthony Vargas <90121982+Speedrunyourknowledge@users.noreply.github.com>
Date: Fri, 18 Apr 2025 05:22:31 -0400
Subject: [PATCH 1/2] fix: get session on frontend

---
 calc-backend/src/index.ts             | 13 +++++++++++--
 calc-frontend/src/App/AuthContext.tsx |  0
 calc-frontend/src/App/RootLayout.tsx  |  4 ++--
 3 files changed, 13 insertions(+), 4 deletions(-)
 delete mode 100644 calc-frontend/src/App/AuthContext.tsx

diff --git a/calc-backend/src/index.ts b/calc-backend/src/index.ts
index f286aa5..794de31 100644
--- a/calc-backend/src/index.ts
+++ b/calc-backend/src/index.ts
@@ -2,7 +2,7 @@ import express from "express";
 import cors from "cors";
 import routes from "./server.routes";
 import errorMiddleware from "./middlewares/errorHandler.middleware";
-import { toNodeHandler } from "better-auth/node";
+import { toNodeHandler, fromNodeHeaders} from "better-auth/node";
 import { auth } from "./lib/auth";
 
 const PORT = process.env.PORT || 3000;
@@ -18,7 +18,16 @@ app.use(cors({
 
 app.all("/api/auth/*", toNodeHandler(auth));
 
-app.use(express.json())
+/*
+app.get("/api/session", async (req, res) => {
+  const session = await auth.api.getSession({
+     headers: fromNodeHeaders(req.headers),
+   });
+ return res.json(session);
+});
+*/
+
+app.use(express.json()) // use this after better auth
 
 // Prefixes the endpoint with /
 app.use('/',routes);
diff --git a/calc-frontend/src/App/AuthContext.tsx b/calc-frontend/src/App/AuthContext.tsx
deleted file mode 100644
index e69de29..0000000
diff --git a/calc-frontend/src/App/RootLayout.tsx b/calc-frontend/src/App/RootLayout.tsx
index 89a5e0a..b6359d9 100644
--- a/calc-frontend/src/App/RootLayout.tsx
+++ b/calc-frontend/src/App/RootLayout.tsx
@@ -7,8 +7,8 @@ import CalcLogo from "../components/CalcLogo"
 import { authClient } from "../lib/auth-client";
 import { Avatar, AvatarFallback, AvatarImage } from "../components/ui/avatar"
 
-function RootLayout() {
-  const session = authClient.useSession();
+async function RootLayout() {
+  const session = await authClient.getSession();
 
   return (
     <>

From 868112ec4c99c3e7567a517c9da9d897d3d9e24d Mon Sep 17 00:00:00 2001
From: Anthony Vargas <90121982+Speedrunyourknowledge@users.noreply.github.com>
Date: Fri, 18 Apr 2025 05:39:02 -0400
Subject: [PATCH 2/2] fix: get session placement

---
 calc-frontend/src/App/RootLayout.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/calc-frontend/src/App/RootLayout.tsx b/calc-frontend/src/App/RootLayout.tsx
index b6359d9..936f698 100644
--- a/calc-frontend/src/App/RootLayout.tsx
+++ b/calc-frontend/src/App/RootLayout.tsx
@@ -7,8 +7,10 @@ import CalcLogo from "../components/CalcLogo"
 import { authClient } from "../lib/auth-client";
 import { Avatar, AvatarFallback, AvatarImage } from "../components/ui/avatar"
 
-async function RootLayout() {
-  const session = await authClient.getSession();
+await authClient.getSession(); // get session
+
+function RootLayout() {
+  const session = authClient.useSession();
 
   return (
     <>