some proper auth

packages/client/package.json

@@ -8,12 +8,15 @@
 	},
 	"dependencies": {
 		"@elysiajs/eden": "^1.3.2",
+		"@solid-primitives/scheduled": "^1.5.2",
 		"@solidjs/router": "^0.15.3",
+		"js-cookie": "^3.0.5",
 		"object-hash": "^3.0.0",
 		"solid-js": "^1.9.5"
 	},
 	"devDependencies": {
 		"@iconify-json/solar": "^1.2.4",
+		"@types/js-cookie": "^3.0.6",
 		"@unocss/preset-icons": "^66.4.2",
 		"@unocss/preset-wind4": "^66.4.2",
 		"unocss": "^66.4.2",

packages/client/src/api.ts

@@ -2,8 +2,6 @@ import { type Api } from "../../server/src/api";
 import { treaty } from "@elysiajs/eden";
 
 const { api } = treaty<Api>("http://localhost:5001", {
-	headers: {
-		human: "daniel",
-	},
+	fetch: { credentials: "include" },
 });
 export default api;

packages/client/src/app.tsx

@@ -1,20 +1,47 @@
-import "./style.css";
 import { Route, Router } from "@solidjs/router";
 import { lazy, Suspense } from "solid-js";
-import pkg from "../package.json";
 import { render } from "solid-js/web";
-import Root from "./routes/index";
 import "virtual:uno.css";
+import pkg from "../package.json";
+import "./style.css";
+import api from "./api";
+
+const Profile = () => {
+	let dialogRef!: HTMLDialogElement;
+
+	return (
+		<>
+			<div
+				onClick={() => dialogRef.showModal()}
+				class="i-solar-user-circle-bold button s-10 m-2 cursor-pointer fixed tr"
+			/>
+
+			<dialog ref={dialogRef} closedby="any">
+				<div class="fixed tr bg-emerald-100 m-2 p-4 rounded-xl border-2 shadow-md shadow-black">
+					Name:{" "}
+					<input
+						onChange={(e) =>
+							api.setName.post({ name: e.target.value })
+						}
+						class="bg-emerald-200 border-1.5 rounded-full px-4"
+					/>
+				</div>
+			</dialog>
+		</>
+	);
+};
 
 const App = () => (
 	<Router
 		root={(props) => (
 			<>
 				<Suspense>{props.children}</Suspense>
+				<Profile />
+
+				{/* Version */}
 				<span class="fixed br m-2 font-mono text-xs">
 					{"v" + pkg.version}
 				</span>
-				<div class="i-solar-user-circle-bold fixed s-10 top-0 right-0 m-2 cursor-pointer" />
 			</>
 		)}
 	>

packages/client/src/routes/[game]/index.tsx

@@ -17,13 +17,7 @@ export default () => {
 				<p class="text-[40px]">{param.game}</p>
 				<button
 					class="px-2 py-1.5 m-4 button rounded"
-					onClick={() =>
-						api.simple.newGame
-							.post({
-								players: ["daniel"],
-							})
-							.then(refetch)
-					}
+					onClick={() => api.simple.newGame.post().then(refetch)}
 				>
 					New Game
 				</button>

packages/server/db/schema.prisma

@@ -17,8 +17,8 @@ model Game {
 }
 
 model Human {
-  key      String     @id
-  name     String
+  key      String     @id @default(cuid(2))
+  name     String     @default("")
   Instance Instance[]
 }
 

packages/server/src/api.ts

@@ -4,19 +4,33 @@ import { Prisma } from "@prisma/client";
 import { simpleApi } from "./games/simple";
 
 const api = new Elysia({ prefix: "/api" })
-	// [wip]
-	.group("/prisma", (app) =>
-		app
-			.post("/game", ({ body }: { body: Prisma.GameFindManyArgs }) =>
-				prisma.game.findMany(body)
-			)
-			.post(
-				"/instance",
-				({ body }: { body: Prisma.InstanceFindManyArgs }) =>
-					prisma.instance.findMany(body)
-			)
+	.onBeforeHandle(async ({ cookie: { token } }) => {
+		if (token.value == null) {
+			console.log("CREATING NEW USER");
+			const newHuman = await prisma.human.create({
+				data: {},
+			});
+			token.value = newHuman.key;
+		}
+	})
+	.guard({ cookie: t.Object({ token: t.String() }) })
+	.post(
+		"/setName",
+		({ cookie: { token: humanKey }, body: { name } }) =>
+			prisma.human.update({
+				where: {
+					key: humanKey.value,
+				},
+				data: {
+					name,
+				},
+			}),
+		{
+			body: t.Object({
+				name: t.String(),
+			}),
+		}
 	)
-
 	.get("/games", () => prisma.game.findMany())
 
 	.get("/instances", ({ query: { game } }) =>
@@ -31,6 +45,7 @@ const api = new Elysia({ prefix: "/api" })
 			},
 		})
 	)
+
 	.use(simpleApi);
 
 export default api;

packages/server/src/games/simple.ts

@@ -111,24 +111,21 @@ export const resolveAction = (
 };
 
 export const simpleApi = new Elysia({ prefix: "/simple" })
-	// .guard({ headers: t.Object({ Human: t.String() }) })
-	.post(
-		"/newGame",
-		(args: { body: { players: string[] }; headers: { human: string } }) => {
-			return prisma.instance.create({
-				data: {
-					gameState: newGame(args.body.players),
-					gameKey: "simple",
-					createdByKey: args.headers.human,
-				},
-			});
-		}
-	)
+	.guard({ cookie: t.Object({ token: t.String() }) })
+	.post("/newGame", ({ cookie: { token: humanKey } }) => {
+		return prisma.instance.create({
+			data: {
+				gameState: newGame([humanKey.value]),
+				gameKey: "simple",
+				createdByKey: humanKey.value,
+			},
+		});
+	})
 	.group("/:instanceId", (app) =>
 		app
 			.get(
 				"/",
-				({ params: { instanceId }, headers: { human: humanId } }) =>
+				({ params: { instanceId }, cookie: { token: humanKey } }) =>
 					prisma.instance
 						.findUnique({
 							where: {
@@ -139,9 +136,9 @@ export const simpleApi = new Elysia({ prefix: "/simple" })
 							getView(
 								getKnowledge(
 									game!.gameState as GameState,
-									humanId!
+									humanKey.value
 								),
-								humanId!
+								humanKey.value
 							)
 						)
 			)
@@ -150,7 +147,7 @@ export const simpleApi = new Elysia({ prefix: "/simple" })
 				({
 					params: { instanceId },
 					body: { action },
-					headers: { human: humanId },
+					cookie: { token: humanKey },
 				}) =>
 					prisma.instance
 						.findUniqueOrThrow({
@@ -161,7 +158,7 @@ export const simpleApi = new Elysia({ prefix: "/simple" })
 						.then(async (game) => {
 							const newState = resolveAction(
 								game.gameState as GameState,
-								humanId!,
+								humanKey.value,
 								action
 							);
 							await prisma.instance.update({
@@ -171,8 +168,8 @@ export const simpleApi = new Elysia({ prefix: "/simple" })
 								},
 							});
 							return getView(
-								getKnowledge(newState, humanId!),
-								humanId!
+								getKnowledge(newState, humanKey.value),
+								humanKey.value
 							);
 						}),
 				{

packages/server/src/index.ts

@@ -6,7 +6,12 @@ import { staticPlugin } from "@elysiajs/static";
 const port = env.PORT || 5001;
 
 const app = new Elysia()
-	.use(cors())
+	.use(
+		cors({
+			origin: "http://localhost:3000",
+			credentials: true,
+		})
+	)
 	.onRequest(({ request }) => {
 		console.log(request.method, request.url);
 	})