Merge pull request #185 from rit-sse/nextauth-type-fix

Fixed nextauth typeerror and removed some unused imports. Build works now

next/app/api/auth/[...nextauth]/route.ts

@@ -1,25 +1,7 @@
-import { PrismaAdapter } from "@auth/prisma-adapter";
-import { PrismaClient } from "@prisma/client";
-import NextAuth, { AuthOptions } from "next-auth";
-import GoogleProvider from "next-auth/providers/google";
+import { authOptions } from "@/lib/authOptions";
+import NextAuth from "next-auth";
 
-const prisma = new PrismaClient();
 
-export const authOptions: AuthOptions = {
-  adapter: PrismaAdapter(prisma),
-  providers: [
-    GoogleProvider({
-      clientId: process.env.GOOGLE_CLIENT_ID || "",
-      clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
-      authorization: {
-        params: {
-          hd: "g.rit.edu", // restrict logins to rit.edu accounts
-        },
-      },
-    }),
-  ],
-};
-
-export const handler = NextAuth(authOptions);
+const handler = NextAuth(authOptions);
 
 export { handler as GET, handler as POST };

next/app/go/GoLink.tsx

@@ -3,7 +3,6 @@ import { GoLinkStar } from "@/components/common/Icons";
 import { GoLinkEdit } from "@/components/common/Icons";
 import { GoLinkDelete } from "@/components/common/Icons";
 import { fetchAuthLevel, goLinksApi } from "@/lib/api";
-import { useEffectAsync } from "@/lib/utils";
 import { useSession } from "next-auth/react";
 import { useCallback, useEffect, useState } from "react";
 

next/app/go/MakeNewGoLink.tsx

@@ -1,7 +1,6 @@
 import { useSession } from "next-auth/react";
 import { use, useCallback, useEffect, useState } from "react";
 import { CreateGoLinkProps } from "./page";
-import { useEffectAsync } from "@/lib/utils";
 import { goLinksApi, fetchAuthLevel } from "@/lib/api";
 
 export const GoLinkButton: React.FC<CreateGoLinkProps> = ({ fetchData }) => {

next/app/layout.tsx

@@ -7,7 +7,7 @@ import Footer from "@/components/Footer";
 import { Inter } from 'next/font/google'
 import { Providers } from "./Providers";
 import { getServerSession } from "next-auth";
-import { authOptions } from "./api/auth/[...nextauth]/route";
+import { authOptions } from '@/lib/authOptions';
 import ScrollToTopButton from "@/components/nav/ScrollToTopButton";
 
 

next/lib/authOptions.ts

@@ -0,0 +1,21 @@
+import { PrismaAdapter } from "@next-auth/prisma-adapter";
+import { PrismaClient } from "@prisma/client";
+import { AuthOptions } from "next-auth";
+import GoogleProvider from "next-auth/providers/google";
+
+const prisma = new PrismaClient();
+
+export const authOptions: AuthOptions = {
+  adapter: PrismaAdapter(prisma),
+  providers: [
+    GoogleProvider({
+      clientId: process.env.GOOGLE_CLIENT_ID || "",
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",
+      authorization: {
+        params: {
+          hd: "g.rit.edu", // restrict logins to rit.edu accounts
+        },
+      },
+    }),
+  ],
+};

next/package.json

@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "@auth/prisma-adapter": "^1.0.6",
+    "@next-auth/prisma-adapter": "^1.0.7",
     "@prisma/client": "^5.4.2",
     "@types/react": "18.2.21",
     "@types/react-dom": "18.2.7",