fix: ci/cd

next.config.js

@@ -1,4 +1,8 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {};
+const nextConfig = {
+  experimental: {
+    serverActions: true,
+  },
+};
 
 module.exports = nextConfig;

src/app/api/secure/batches/all/route.ts

@@ -5,6 +5,8 @@ import { getUserId } from "@/components/auth/server";
 
 export async function GET(request: NextRequest) {
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
 
   const results = await prisma.batch.findMany({
     where: {

src/app/api/secure/batches/new/route.ts

@@ -17,6 +17,9 @@ const schema = z.object({
 
 export async function GET(request: NextRequest) {
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
+
   const body = schema.safeParse(await request.json());
   if (!body.success) {
     const { errors } = body.error;

src/app/api/secure/branches/all/route.ts

@@ -4,6 +4,8 @@ import { getUserId } from "@/components/auth/server";
 
 export async function GET(request: NextRequest) {
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
 
   const results = await prisma.branch.findMany({
     select: {

src/app/api/secure/profile/route.ts

@@ -28,7 +28,10 @@ export async function PUT(request: NextRequest) {
       { status: 400 }
     );
   }
+
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
 
   const res = await prisma.user.upsert({
     where: {
@@ -58,6 +61,8 @@ export async function PUT(request: NextRequest) {
 
 export async function GET(request: NextRequest) {
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
 
   const res = await prisma.user.findUnique({
     where: {

src/app/api/secure/sbte-result/history/route.ts

@@ -5,6 +5,8 @@ import { getUserId } from "@/components/auth/server";
 
 export async function GET(request: NextRequest) {
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
 
   const results = await prisma.examResultFormatHistory.findMany({
     where: {

src/app/api/secure/sbte-result/route.ts

@@ -68,6 +68,8 @@ export async function POST(request: NextRequest) {
     );
   }
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
 
   const myProfile = await prisma.user.findUnique({
     where: {

src/app/api/secure/sbte-result/single/[resultId]/route.ts

@@ -8,6 +8,8 @@ export async function GET(
   { params }: { params: { resultId: string } }
 ) {
   const userId = await getUserId(request);
+  if (!userId)
+    return NextResponse.json({ message: "Unauthenticated" }, { status: 401 });
 
   const results = await prisma.examResultFormatHistory.findUnique({
     where: {

src/app/auth/page.tsx

@@ -1,6 +1,9 @@
 import SBTEToolsLogo from "@/components/Logo";
 import HankoAuth from "@/components/auth/HankoAuth";
 
+// CI fails without this
+export const dynamic = "force-dynamic";
+
 export default function LoginPage() {
   return (
     <>

src/app/layout.tsx

@@ -11,6 +11,7 @@ const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
   title: "Poly Tools",
+  metadataBase: new URL("https://poly-tools.vercel.app"),
   keywords: [
     "SBTE",
     "SBTE Tools",

src/components/auth/HankoAuth.tsx

@@ -3,13 +3,11 @@
 import { useEffect, useCallback, useState } from "react";
 import { useRouter } from "next/navigation";
 import { register } from "@teamhanko/hanko-elements";
-
-import { Hanko } from "@teamhanko/hanko-frontend-sdk";
+import type { Hanko } from "@teamhanko/hanko-frontend-sdk";
 
 const hankoApi = process.env.NEXT_PUBLIC_HANKO_API_URL!;
 
 export default function HankoAuth({ className }: { className?: string }) {
-  console.log("API URL", hankoApi);
   const router = useRouter();
 
   const [hanko, setHanko] = useState<Hanko>();

src/components/auth/server.ts

@@ -1,4 +1,4 @@
-import axios from "axios";
+"use server";
 import { hankoApiUrl } from "./vars";
 import { createRemoteJWKSet, jwtVerify } from "jose";
 import { NextRequest } from "next/server";
@@ -14,17 +14,18 @@ export const fetchUserId = async (hanko: string) => {
 };
 
 export const getUserId = async (req: NextRequest) => {
-  // const userId = req.headers.get("x-user-id");
-  const hanko = req.cookies.get("hanko")?.value;
-  if (!hanko) {
-    throw new Error("No Hanko cookie found");
-  }
-  const userId = await fetchUserId(hanko);
-  // validate userId is uuid using zod
-  const schema = z.string().uuid();
-  const validatedUserId = schema.safeParse(userId);
-  if (!validatedUserId.success) {
-    throw new Error("Invalid user id");
-  }
-  return validatedUserId.data;
+  const userId = req.headers.get("x-user-id");
+  return userId;
+  // const hanko = req.cookies.get("hanko")?.value ?? "";
+  // if (!hanko) {
+  //   throw new Error("No Hanko cookie found");
+  // }
+  // const userId = await fetchUserId(hanko);
+  // // validate userId is uuid using zod
+  // const schema = z.string().uuid();
+  // const validatedUserId = schema.safeParse(userId);
+  // if (!validatedUserId.success) {
+  //   throw new Error("Invalid user id");
+  // }
+  // return validatedUserId.data;
 };

src/components/home/SignInButton.tsx

@@ -43,7 +43,7 @@ function SignInButton() {
     >
       <Link href="/auth">
         <span className="inline-flex h-full w-fit items-center gap-1 rounded-sm px-4 py-2 transition-all duration-300 dark:bg-neutral-900 dark:text-white group-hover:dark:bg-black">
-          {loading || status === "loading" ? (
+          {loading ? (
             <Loader2 className="h-5 w-5 animate-spin" />
           ) : (
             <LogIn className="mr-1 h-4 w-4 stroke-[3]" />