Merge pull request #205 from Speedrunyourknowledge/develop

fix: sign-in now works on the internet

Author: Speedrunyourknowledge

README.md

@@ -3,3 +3,7 @@ Calculus visualizer for UCF Knight Hacks. A website with interactive graphs for
 
 ## Learn useful git commands
 Check out the GIT_COMMANDS.md file. It has all the git commands a beginner (or veteran) should know.
+
+## Make changes here to trigger deployment
+
+change b

calc-backend/prisma/schema.prisma

@@ -6,7 +6,7 @@
 
 generator client {
   provider = "prisma-client-js"
-  output = "./client"
+  output   = "./client"
 }
 
 datasource db {
@@ -65,14 +65,14 @@ model Account {
 }
 
 model Verification {
-   id         String   @id @default(cuid()) @map("_id")
-   identifier String
-   value      String
-   expiresAt  DateTime
-   createdAt  DateTime @default(now())
-   updatedAt  DateTime @updatedAt
- 
-   @@map("verification")
+  id         String   @id @default(cuid()) @map("_id")
+  identifier String
+  value      String
+  expiresAt  DateTime
+  createdAt  DateTime @default(now())
+  updatedAt  DateTime @updatedAt
+
+  @@map("verification")
 }
 
 model Func {

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, fromNodeHeaders} from "better-auth/node";
+import { toNodeHandler } from "better-auth/node";
 import { auth } from "./lib/auth";
 
 const PORT = process.env.PORT || 3000;
@@ -18,13 +18,6 @@ app.use(cors({
 
 app.all("/api/auth/*", toNodeHandler(auth));
 
-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 /

calc-backend/src/lib/auth.ts

@@ -1,26 +1,32 @@
-import { betterAuth, BetterAuthOptions } from "better-auth";
+import { betterAuth } from "better-auth";
 import { prismaAdapter } from "better-auth/adapters/prisma";
 import prisma from "./prisma";
 
 export const auth = betterAuth({
     database: prismaAdapter(prisma, {
         provider: "mongodb",
     }),
-    trustedOrigins: ["http://localhost:5173", 'https://calcvisualizer.netlify.app'],
+    trustedOrigins: ["http://localhost:5173", 
+      "https://calcvisualizer.speedrunyourknowledge.com",
+      "https://calcvisualizer.netlify.app"
+    ],
     socialProviders: {
         google: {
             clientId: process.env.GOOGLE_CLIENT_ID as string,
             clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
         }
     },
-    session: {
-      cookieCache: {
-        enabled: true,
-        maxAge: 60 * 60 // Cache duration in seconds
-      }
-    },
     advanced: {
-      cookiePrefix: "calcvis"
+      crossSubDomainCookies: {
+        enabled: true,
+        domain: ".speedrunyourknowledge.com", // Domain with a leading period
+      },
+      defaultCookieAttributes: {
+        secure: true,
+        httpOnly: true,
+        sameSite: "none",  // Allows CORS-based cookie sharing across subdomains
+        partitioned: true, // New browser standards will mandate this for foreign cookies
+      },
     },
     onAPIError: {
       throw: true,
@@ -29,4 +35,4 @@ export const auth = betterAuth({
       },
       errorURL: process.env.FRONTEND_URL || 'http://localhost:5173' + '/auth-error'
     }
-} satisfies BetterAuthOptions);
+});

calc-frontend/src/App/App.tsx

@@ -15,7 +15,8 @@ function App() {
   // Handles all the routes
   // The calc-visualizer path is for github pages
   const router = createBrowserRouter(
-    createRoutesFromElements(RoutesList));
+    createRoutesFromElements(RoutesList)
+  );
 
   return (
     <>

calc-frontend/src/App/RootLayout.tsx

@@ -6,35 +6,13 @@ import CalcLogo from "../components/CalcLogo"
 
 import { authClient } from "../lib/auth-client";
 import { Avatar, AvatarFallback, AvatarImage } from "../components/ui/avatar"
-import { useEffect } from "react";
-import axios from "axios";
 
 function RootLayout() {
 
-  const serverUrl = import.meta.env.VITE_SERVER_URL || 'http://localhost:3000'
-
   const session = authClient.useSession();
 
-
-  const requestSession = async () => {
-
-    try{
-      const response = await axios.get(serverUrl + '/api/session', { withCredentials: true })
-
-      console.log(response)
-    }
-    catch(e){
-      console.error("session error: ", e)
-    }
-  }
-
-  useEffect(() => {
-
-    requestSession()
-
-  }, [])
-
-
+  console.log('useSession: ' + session.data)
+  
   return (
     <>
       <ScrollRestoration />
@@ -54,11 +32,11 @@ function RootLayout() {
 
         </div>
         {session.data?.session ? (
-          session.data?.user.image ? (
+          session.data.user.image ? (
             <Link to="/dashboard">
               <Avatar className="mr-5 cursor-pointer w-12 h-12">
-                <AvatarImage src={session.data?.user.image} />
-                <AvatarFallback>{session.data?.user.name.charAt(0)}</AvatarFallback>
+                <AvatarImage src={session.data.user.image} />
+                <AvatarFallback>{session.data.user.name.charAt(0)}</AvatarFallback>
               </Avatar>
             </Link>
           ) : (

calc-frontend/src/components/Custom/DerivCustomGraph.tsx

@@ -22,7 +22,6 @@ function DerivCustomGraph({func, lowerBound, upperBound, handleSave, onAIRespons
         'upperBound': upperBound
 
       }
-      // { withCredentials:true}
     )
 
     // add loading circle when ready is false

calc-frontend/src/components/Custom/IntCustomGraph.tsx

@@ -22,7 +22,6 @@ function IntCustomGraph({func, lowerBound, upperBound, handleSave, onAIResponseC
         'upperBound': upperBound
 
       }
-      // { withCredentials:true}
     )
 
     // add loading circle when ready is false

calc-frontend/src/components/ui/SaveFunctionButton.tsx

@@ -1,21 +1,11 @@
-import { useNavigate } from "react-router";
-import { authClient } from "../../lib/auth-client";
-import { Session } from "../../lib/auth-client";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger, TooltipArrow } from "@radix-ui/react-tooltip";
 
-
-function SaveFunctionButton({onSave, saving, enableSave}: {onSave: (session: Session) => void, 
+function SaveFunctionButton({onSave, saving, enableSave}: {onSave: () => void, 
   saving: boolean, enableSave: boolean})
 {
-    const navigate = useNavigate();
-    const session = authClient.useSession();
-
     const handleClick = () => {
-        if(!session.data?.session ) {
-            navigate("/sign-in");
-            return;
-        }
-        onSave(session.data);
+
+        onSave();
     }
 
     if(saving){

calc-frontend/src/components/ui/SignOutButton.tsx

@@ -1,15 +1,22 @@
-import { toast } from "sonner";
 import { authClient } from "../../lib/auth-client"
+import { useNavigate } from "react-router";
 
 function SignOutButton()
 {
+  const navigate = useNavigate()
+
     const handleSignOut = async () => {
         try {
-            await authClient.signOut();
-
+            await authClient.signOut({
+              fetchOptions: {
+                onSuccess: () => {
+                  navigate("/"); // redirect to home
+                },
+                withCredentials:true
+              }
+            });
         } catch (error) {
-            toast.error("Something went wrong signing out");
-            console.error("Error signing out:", error);
+            console.error("Error signing out: ", error);
         }   
     }