From 1b2673fc932198f6dee302926a1f27ef9bbb29f4 Mon Sep 17 00:00:00 2001 From: aronmal Date: Sun, 10 Mar 2024 17:54:10 +0100 Subject: [PATCH] Fix: Resolve errors from untested previous commit --- src/app.tsx | 2 +- src/entry-server.tsx | 1 + src/middleware.ts | 12 +++++++----- src/routes/api/[guildId]/config.ts | 2 +- src/routes/api/[guildId]/matches.ts | 4 +--- src/routes/api/[guildId]/timePlanning.ts | 2 +- src/routes/api/auth/callback/discord.ts | 2 +- src/routes/api/auth/login.ts | 2 +- src/routes/api/auth/logout.ts | 2 +- src/routes/api/boot.ts | 2 +- 10 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/app.tsx b/src/app.tsx index bb7de6e..57d99cd 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -2,7 +2,7 @@ import "@fortawesome/fontawesome-svg-core/styles.css"; import { Meta, MetaProvider, Title } from "@solidjs/meta"; import { Router } from "@solidjs/router"; -import { FileRoutes } from "@solidjs/start"; +import { FileRoutes } from "@solidjs/start/router"; import { Suspense } from "solid-js"; import "./styles/global.scss"; diff --git a/src/entry-server.tsx b/src/entry-server.tsx index 46434c7..c81e043 100644 --- a/src/entry-server.tsx +++ b/src/entry-server.tsx @@ -1,3 +1,4 @@ +// @refresh reload import { StartServer, createHandler } from "@solidjs/start/server"; export default createHandler(() => ( diff --git a/src/middleware.ts b/src/middleware.ts index d344e7e..cbbf2d0 100644 --- a/src/middleware.ts +++ b/src/middleware.ts @@ -12,8 +12,8 @@ let started: boolean = false; export default createMiddleware({ onRequest: async (event) => { if (event.nativeEvent.node.req.method !== "GET") { - const originHeader = getHeader(event, "Origin") ?? null; - const hostHeader = getHeader(event, "Host") ?? null; + const originHeader = getHeader(event.nativeEvent, "Origin") ?? null; + const hostHeader = getHeader(event.nativeEvent, "Host") ?? null; if ( !originHeader || !hostHeader || @@ -24,7 +24,8 @@ export default createMiddleware({ } } - const sessionId = getCookie(event, lucia.sessionCookieName) ?? null; + const sessionId = + getCookie(event.nativeEvent, lucia.sessionCookieName) ?? null; if (!sessionId) { event.nativeEvent.context.session = null; event.nativeEvent.context.user = null; @@ -34,18 +35,19 @@ export default createMiddleware({ const { session, user } = await lucia.validateSession(sessionId); if (session && session.fresh) { appendHeader( - event, + event.nativeEvent, "Set-Cookie", lucia.createSessionCookie(session.id).serialize(), ); } if (!session) { appendHeader( - event, + event.nativeEvent, "Set-Cookie", lucia.createBlankSessionCookie().serialize(), ); } + console.log(3); event.nativeEvent.context.session = session; event.nativeEvent.context.user = user; }, diff --git a/src/routes/api/[guildId]/config.ts b/src/routes/api/[guildId]/config.ts index ad269ee..3f722c3 100644 --- a/src/routes/api/[guildId]/config.ts +++ b/src/routes/api/[guildId]/config.ts @@ -1,4 +1,4 @@ -import { APIEvent } from "@solidjs/start/server/types"; +import { APIEvent } from "@solidjs/start/server"; import { eq } from "drizzle-orm"; import db from "~/drizzle"; import { guilds } from "~/drizzle/schema"; diff --git a/src/routes/api/[guildId]/matches.ts b/src/routes/api/[guildId]/matches.ts index c47ddd3..da2bfea 100644 --- a/src/routes/api/[guildId]/matches.ts +++ b/src/routes/api/[guildId]/matches.ts @@ -1,4 +1,4 @@ -import { APIEvent } from "@solidjs/start/server/types"; +import { APIEvent } from "@solidjs/start/server"; import { eq } from "drizzle-orm"; import db from "~/drizzle"; import { guilds, matches } from "~/drizzle/schema"; @@ -40,8 +40,6 @@ export const GET = async ( if (!guild) return ErrorResponse("NOT_FOUND"); - if (guild.matches.length < 1) return Res("NO_CONTENT", null); - return Res("OK", { matches: buildMatches(guild.matches), timezone: guild.timezone, diff --git a/src/routes/api/[guildId]/timePlanning.ts b/src/routes/api/[guildId]/timePlanning.ts index ddf4255..fd276b5 100644 --- a/src/routes/api/[guildId]/timePlanning.ts +++ b/src/routes/api/[guildId]/timePlanning.ts @@ -1,4 +1,4 @@ -import { APIEvent } from "@solidjs/start/server/types"; +import { APIEvent } from "@solidjs/start/server"; import { and, eq } from "drizzle-orm"; import db from "~/drizzle"; import { guilds, tpMessages } from "~/drizzle/schema"; diff --git a/src/routes/api/auth/callback/discord.ts b/src/routes/api/auth/callback/discord.ts index d0f5cce..07519b8 100644 --- a/src/routes/api/auth/callback/discord.ts +++ b/src/routes/api/auth/callback/discord.ts @@ -1,5 +1,5 @@ import { createId } from "@paralleldrive/cuid2"; -import { APIEvent } from "@solidjs/start/server/types"; +import { APIEvent } from "@solidjs/start/server"; import { OAuth2RequestError } from "arctic"; import { eq } from "drizzle-orm"; import httpStatus from "http-status"; diff --git a/src/routes/api/auth/login.ts b/src/routes/api/auth/login.ts index 47a74d9..bc4a45b 100644 --- a/src/routes/api/auth/login.ts +++ b/src/routes/api/auth/login.ts @@ -1,4 +1,4 @@ -import { APIEvent } from "@solidjs/start/server/types"; +import { APIEvent } from "@solidjs/start/server"; import { generateState } from "arctic"; import httpStatus from "http-status"; import { setCookie } from "vinxi/http"; diff --git a/src/routes/api/auth/logout.ts b/src/routes/api/auth/logout.ts index ece785d..0ba8a30 100644 --- a/src/routes/api/auth/logout.ts +++ b/src/routes/api/auth/logout.ts @@ -1,4 +1,4 @@ -import { APIEvent } from "@solidjs/start/server/types"; +import { APIEvent } from "@solidjs/start/server"; import httpStatus from "http-status"; import { appendHeader } from "vinxi/http"; import { lucia } from "~/lib/auth"; diff --git a/src/routes/api/boot.ts b/src/routes/api/boot.ts index fdd375b..4d6b624 100644 --- a/src/routes/api/boot.ts +++ b/src/routes/api/boot.ts @@ -1,4 +1,4 @@ -import { APIEvent } from "@solidjs/start/server/types"; +import { APIEvent } from "@solidjs/start/server"; import { eq } from "drizzle-orm"; import db from "~/drizzle"; import { guilds } from "~/drizzle/schema";