removed economy page and extracted authOptions to own file

cybernetisk · Nov 19, 2024 · 24c01b5 · 24c01b5
1 parent 2009232
commit 24c01b5
Show file tree

Hide file tree

Showing 17 changed files with 109 additions and 264 deletions.
diff --git a/app/(pages)/(main)/volunteering/economy/layout.js b/app/(pages)/(main)/volunteering/economy/layout.js
diff --git a/app/(pages)/(main)/volunteering/economy/page.js b/app/(pages)/(main)/volunteering/economy/page.js
diff --git a/app/api/utils/auth.js b/app/api/utils/auth.js
@@ -1,5 +1,5 @@
 import { getServerSession } from "next-auth";
-import { authOptions } from "../v2/auth/[...nextauth]/route";
+import { authOptions } from "../utils/authOptions";
 import { NextRequest, NextResponse } from "next/server";
 
 const NOT_AUTHORIZED = NextResponse.json({error: "Not authorized"}, {status: 403})

diff --git a/app/api/utils/authOptions.js b/app/api/utils/authOptions.js
@@ -0,0 +1,95 @@
+
+import Email from "next-auth/providers/email";
+import { PrismaAdapter } from "@next-auth/prisma-adapter";
+import prisma from "@/prisma/prismaClient";
+
+export const authOptions = {
+  providers: [
+    Email({
+      server: {
+        host: "smtp.gmail.com",
+        port: 587,
+        auth: {
+          user: process.env.NODEMAILER_NOREPLY_USER,
+          pass: process.env.NODEMAILER_NOREPLY_PASSWORD,
+        },
+      },
+      from: process.env.NODEMAILER_NOREPLY_USER,
+    }),
+  ],
+  callbacks: {
+    async signIn({ user }) {
+      const cybUser = await prisma.user.findFirst({
+        where: {
+          email: user.email,
+        },
+      });
+
+      if (!cybUser) {
+        throw "No user found";
+      }
+
+      if (!cybUser.active) {
+        throw "Email has not been verified";
+      }
+
+      return true;
+    },
+    async session({ session }) {
+      const cybUser = await prisma.user.findFirst({
+        where: {
+          email: session.user.email,
+        },
+        select: {
+          id: true,
+          firstName: true,
+          lastName: true,
+          recruitedByUser: true,
+          recruitedUsers: true,
+          roles: {
+            select: {
+              role: {
+                select: {
+                  name: true,
+                },
+              },
+            },
+          },
+        },
+      });
+
+      const semesters = await prisma.semester.findMany({
+        orderBy: {
+          id: "desc",
+        },
+        take: 1,
+      });
+      const currentSemester = await semesters[0];
+
+      if (cybUser) {
+        session.user.name = `${cybUser.firstName} ${cybUser.lastName}`;
+        delete session.user.name;
+
+        session.user = {
+          ...session.user,
+          ...cybUser,
+          roles: cybUser.roles.map((e) => e.role.name),
+          name: `${cybUser.firstName} ${
+            cybUser.lastName ? cybUser.lastName : ""
+          }`,
+        };
+      }
+
+      // console.log(currentSemester);
+      if (currentSemester) {
+        session.semester = currentSemester;
+      }
+
+      return session;
+    },
+  },
+  pages: {
+    signIn: "/auth/signIn",
+  },
+  adapter: PrismaAdapter(prisma),
+};
diff --git a/app/api/v2/auth/[...nextauth]/route.js b/app/api/v2/auth/[...nextauth]/route.js
@@ -1,100 +1,6 @@
 
-
 import NextAuth from "next-auth";
-import Email from "next-auth/providers/email";
-import { PrismaAdapter } from "@next-auth/prisma-adapter";
-import prisma from "@/prisma/prismaClient";
-
-export const authOptions = {
-  providers: [
-    Email({
-      server: {
-        host: "smtp.gmail.com",
-        port: 587,
-        auth: {
-          user: process.env.NODEMAILER_NOREPLY_USER,
-          pass: process.env.NODEMAILER_NOREPLY_PASSWORD,
-        },
-      },
-      from: process.env.NODEMAILER_NOREPLY_USER
-    }),
-  ],
-  callbacks: {
-    async signIn({ user }) {
-
-      const cybUser = await prisma.user.findFirst({
-        where: {
-          email: user.email
-        }
-      })
-
-      if (!cybUser) {
-        throw "No user found"
-      }
-
-      if (!cybUser.active) {
-        throw "Email has not been verified"
-      }
-
-      return true
-    },
-    async session({ session }) {
-
-      const cybUser = await prisma.user.findFirst({
-        where: {
-          email: session.user.email,  
-        },
-        select: {
-          id: true,
-          firstName: true,
-          lastName: true,
-          recruitedByUser: true,
-          recruitedUsers: true,
-          roles: {
-            select: {
-              role: {
-                select: {
-                  name: true
-                }
-              },
-            },
-          },
-        },
-      });
-
-      const semesters = await prisma.semester.findMany({
-        orderBy: {
-          id: "desc"
-        },
-        take: 1,
-      })
-      const currentSemester = await semesters[0];
-
-      if (cybUser) {
-        session.user.name = `${cybUser.firstName} ${cybUser.lastName}`
-        delete session.user.name;
-
-        session.user = {
-          ...session.user,
-          ...cybUser,
-          roles: cybUser.roles.map((e) => e.role.name),
-          name: `${cybUser.firstName} ${cybUser.lastName ? cybUser.lastName : ""}`
-        }
-      }
-
-      // console.log(currentSemester);
-      if (currentSemester) {
-        session.semester = currentSemester;
-      }
-
-      return session
-    }
-  },
-  pages: {
-    signIn: "/auth/signIn"
-  },
-  adapter: PrismaAdapter(prisma),
-}
+import { authOptions } from "@/app/api/utils/authOptions";
 
 const handler = NextAuth(authOptions);
 

diff --git a/app/api/v2/memberships/route.js b/app/api/v2/memberships/route.js
@@ -3,9 +3,7 @@ import { NextResponse } from "next/server";
 import prisma from "@/prisma/prismaClient";
 import { Auth } from "../../utils/auth";
 import { getServerSession } from "next-auth";
-import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
-
-
+import { authOptions } from "@/app/api/utils/authOptions";
 
 
 export async function GET(req) {

diff --git a/app/api/v2/recruitGraph/route.js b/app/api/v2/recruitGraph/route.js
@@ -3,7 +3,7 @@ import { NextResponse } from "next/server";
 import prisma from "@/prisma/prismaClient";
 import { Auth } from "../../utils/auth";
 import { getServerSession } from "next-auth";
-import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+import { authOptions } from "@/app/api/utils/authOptions";
 
 
 

diff --git a/app/api/v2/roles/route.js b/app/api/v2/roles/route.js
@@ -3,7 +3,7 @@ import { NextResponse } from "next/server";
 import prisma from "@/prisma/prismaClient";
 import { Auth } from "../../utils/auth";
 import { getServerSession } from "next-auth";
-import { authOptions } from "@/app/api/v2/auth/[...nextauth]/route";
+import { authOptions } from "@/app/api/utils/authOptions";