fixed types in route handlers

Author: rgerum

src/app/(stories)/learn/welcome.jsx

@@ -1,11 +1,11 @@
 "use client";
 import styles from "./learn.module.css";
 import { signIn } from "next-auth/react";
-import styles2 from "../auth/register.module.css";
+import styles2 from "../../auth/register.module.css";
 import Link from "next/link";
 import React from "react";
 
-export default async function Page() {
+export default function Page() {
   return (
     <div className={styles.container}>
       <div>

src/app/editor/(course)/approve/[story_id]/route.js renamed to src/app/editor/(course)/approve/[story_id]/route.ts

@@ -1,16 +1,20 @@
 import { sql } from "@/lib/db";
-import { NextResponse } from "next/server";
+import { NextRequest, NextResponse } from "next/server";
 import { revalidateTag } from "next/cache";
 import { getUser } from "@/lib/userInterface";
 
-export async function GET(req, { params: { story_id } }) {
-  const token = await getUser(req);
+export async function GET(
+  request: Request,
+  { params }: { params: Promise<{ story_id: string }> },
+) {
+  const token = await getUser();
 
-  if (!token.role) return new Response("Error not allowed", { status: 401 });
+  if (!token || !token.role || !token.id)
+    return new Response("Error not allowed", { status: 401 });
 
   let answer = await set_approve({
-    story_id: parseInt(story_id),
-    user_id: token?.id,
+    story_id: parseInt((await params).story_id),
+    user_id: parseInt(token.id),
   });
 
   if (answer === undefined)
@@ -19,14 +23,20 @@ export async function GET(req, { params: { story_id } }) {
   return NextResponse.json(answer);
 }
 
-async function set_status(data) {
+async function set_status(data: { status: string | undefined; id: number }) {
   return sql`
   UPDATE story SET ${sql(data, "status")}
   WHERE id = ${data.id}
 `;
 }
 
-async function set_approve({ story_id, user_id }) {
+async function set_approve({
+  story_id,
+  user_id,
+}: {
+  story_id: number;
+  user_id: number;
+}) {
   let res =
     await sql`SELECT id FROM story_approval WHERE story_id = ${story_id} AND user_id = ${user_id};`;
   let action;

src/app/editor/(course)/course/[course_id]/import/send/[story_id]/route.js renamed to src/app/editor/(course)/course/[course_id]/import/send/[story_id]/route.ts

@@ -3,17 +3,21 @@ import { upload_github } from "@/lib/editor/upload_github";
 import { NextResponse } from "next/server";
 import { getUser } from "@/lib/userInterface";
 
-export async function GET(req, { params: { course_id, story_id } }) {
-  const token = await getUser(req);
+export async function GET(
+  req: Request,
 
-  if (!token.role)
+  { params }: { params: Promise<{ course_id: string; story_id: string }> },
+) {
+  const token = await getUser();
+
+  if (!token || !token.role || !token.id || !token.name)
     return new Response("You need to be a registered contributor.", {
       status: 401,
     });
 
   let answer = await set_import(
-    { id: story_id, course_id: course_id },
-    { user_id: token?.id, username: token?.name },
+    { id: (await params).story_id, course_id: (await params).course_id },
+    { user_id: token.id, username: token.name },
   );
 
   if (answer === undefined)
@@ -22,7 +26,10 @@ export async function GET(req, { params: { course_id, story_id } }) {
   return NextResponse.json(answer);
 }
 
-async function set_import({ id, course_id }, { user_id, username }) {
+async function set_import(
+  { id, course_id }: { id: string; course_id: string },
+  { user_id, username }: { user_id: string; username: string },
+) {
   let data = (
     await sql`SELECT duo_id, name, image, set_id, set_index, text, json FROM story WHERE id = ${id};`
   )[0];

src/components/login/LoggedInButtonWrappedClient.tsx

@@ -15,7 +15,7 @@ export function LoggedInButtonWrappedClient(props: {
     page,
   );
   const user = session?.user;
-  console.log("user", user);
+
   return (
     <>
       {user ? (

src/components/login/LoggedInButtonWrappedServer.tsx

@@ -7,9 +7,8 @@ export async function LoggedInButtonWrapped(props: {
   page: string;
 }) {
   const { course_id, page } = props;
-  console.log("------------------------LoggedInButtonWrapped", course_id, page);
   const user = await getUser();
-  console.log("user", user);
+
   return (
     <>
       {user ? (

src/lib/userInterface.ts

@@ -2,21 +2,21 @@
 import { redirect } from "next/navigation";
 import { auth } from "@/auth";
 import { NextApiRequest, NextApiResponse } from "next";
+import { NextRequest } from "next/server";
 
 export async function getUser(
-  req?: NextApiRequest | undefined,
+  req?: NextRequest | undefined,
   response?: NextApiResponse | undefined,
 ) {
   if (typeof req !== "undefined" && typeof response !== "undefined") {
-    const session = await auth(req, response);
+    const session = await auth();
     //console.log("sessionAPI", session);
 
     return session?.user;
   }
   const session = await auth();
   //console.log("sessionHTML", session);
   return session?.user;
-  return { admin: false };
 }
 
 export async function requireAdmin() {