Merge pull request #5 from kcoderhtml/dev

feat: fix middleware

astro.config.mjs

@@ -7,9 +7,7 @@ import db from "@astrojs/db";
 
 // https://astro.build/config
 export default defineConfig({
-  output: "server",
-  adapter: netlify({
-    edgeMiddleware: true
-  }),
-  integrations: [tailwind(), playformCompress(), db()]
-});
+	output: "server",
+	adapter: netlify(),
+	integrations: [tailwind(), playformCompress(), db()],
+});

src/pages/api/subscribe.ts

@@ -9,7 +9,7 @@ function generateSecret() {
     return secret;
 }
 
-export const POST: APIRoute = async ({ params, request }) => {
+export const POST: APIRoute = async ({ request }) => {
     const aj = arcjet({
         key: process.env.ARCJET_KEY!,
         rules: [
@@ -94,7 +94,7 @@ export const POST: APIRoute = async ({ params, request }) => {
     }
 }
 
-export const GET: APIRoute = async ({ params }) => {
+export const GET: APIRoute = async () => {
     return new Response(JSON.stringify({ ok: true, message: "Hello from the subscribe API" }), {
         status: 200,
         headers: {

src/pages/dashboard.astro

@@ -1,5 +1,4 @@
 ---
-import { date } from "astro/zod";
 import Layout from "../layouts/Layout.astro";
 
 import { db, Subscribers } from "astro:db";

src/pages/index.astro

@@ -1,6 +1,6 @@
 ---
 import Layout from "../layouts/Layout.astro";
-import { createSession, gracePeriod, getSession } from "../utils/auth/auth";
+import { createSession, getSession, gracePeriod } from "../utils/auth/auth";
 import type { Session } from "../utils/auth/auth";
 
 let session: Session | null = null;

src/utils/auth/middleware.ts

@@ -1,5 +1,5 @@
 import { defineMiddleware } from "astro:middleware";
-import type { DecodeResult, ExpirationStatus, Session } from "./auth";
+import type { DecodeResult, ExpirationStatus } from "./auth";
 import { decodeSession, encodeSession, checkExpirationStatus, gracePeriod } from "./auth";
 
 const PUBLIC_ROUTES = ["/", "/favicon.ico", "/api/subscribe", "/api/unsubscribe"];
@@ -42,21 +42,11 @@ export const auth = defineMiddleware(async (context, next) => {
         return unauthorized(`Authorization token has expired. Please create a new authorization token by logging in again.`, true);
     }
 
-
-    let session: Session;
-
     if (expiration === "grace") {
         // Automatically renew the session and send it back with the response
-        const { token, expires, issued } = encodeSession(process.env.JWT_SECRET, decodedSession.session);
-        session = {
-            ...decodedSession.session,
-            expires: expires,
-            issued: issued
-        };
+        const { token, expires } = encodeSession(process.env.JWT_SECRET, decodedSession.session);
 
         context.cookies.set(cookieName, token, { expires: new Date(expires + gracePeriod) });
-    } else {
-        session = decodedSession.session;
     }
 
     // Request has a valid or renewed session. Call next to continue to the authenticated route handler