Sync Upstream

.github/workflows/unit-testing.yml

@@ -36,3 +36,5 @@ jobs:
           GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
           SENDGRID_API_KEY: ${{ secrets.SENDGRID_API_KEY }}
           GOOGLE_BASEFOLDER: ${{ secrets.GOOGLE_BASEFOLDER }}
+          GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
+          GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}

prisma/schema.prisma

@@ -91,6 +91,7 @@ model Senior {
   firstname   String
   lastname    String
   location    String
+  dateCreated DateTime @default(now())
   description String
   StudentIDs  String[] @db.ObjectId
   Students    User[]   @relation(fields: [StudentIDs], references: [id])
@@ -132,10 +133,13 @@ model Chapter {
   id            String   @id @default(auto()) @map("_id") @db.ObjectId
   chapterName   String
   location      String
-  chapterFolder String   @default("")
   dateCreated   DateTime @default(now())
   students      User[]
   seniors       Senior[]
+
+  // Google Drive API related fields
+  chapterFolder String   @default("")
+  permissions   String[]
 }
 
 model Resource {

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

@@ -6,16 +6,9 @@ import NextAuth, { NextAuthOptions } from "next-auth";
 import GoogleProvider from "next-auth/providers/google";
 
 const GOOGLE_API_SCOPE = [
-  "https://www.googleapis.com/auth/drive",
-  "https://www.googleapis.com/auth/drive.appdata",
-  "https://www.googleapis.com/auth/drive.appfolder",
-  "https://www.googleapis.com/auth/drive.file",
-  "https://www.googleapis.com/auth/drive.resource",
-  "https://www.googleapis.com/auth/documents",
-  "https://www.googleapis.com/auth/documents.readonly",
+  "openid",
   "https://www.googleapis.com/auth/userinfo.profile",
   "https://www.googleapis.com/auth/userinfo.email",
-  "openid",
 ];
 
 export const authOptions: NextAuthOptions = {

src/app/api/chapter/[chapterId]/route.ts

@@ -0,0 +1,35 @@
+import { NextResponse } from "next/server";
+import { withSessionAndRole } from "@server/decorator";
+import { prisma } from "@server/db/client";
+import { driveV3 } from "@server/service";
+
+export const DELETE = withSessionAndRole(["ADMIN"], async ({ params }) => {
+  // TODO
+  // 1. Implement route.client.ts
+  // 2. Implement route.schema.ts
+  // 3. Finish deleting chapter
+  // 4. Add it to AdminHomePage
+
+  const chapterId = params.params.chapterId;
+  const chapter = await prisma.chapter.findUnique({
+    where: {
+      id: chapterId,
+    },
+  });
+
+  if (chapter == null) {
+    // If no ID is found, chapter has been deleted by another admin.
+    return NextResponse.json("ok");
+  }
+
+  await Promise.allSettled(
+    chapter.permissions.map((permissionId) =>
+      driveV3.permissions.delete({
+        fileId: chapter.chapterFolder,
+        permissionId: permissionId,
+      })
+    )
+  );
+
+  return NextResponse.json("ok");
+});

src/app/api/file/[fileId]/route.ts

@@ -6,12 +6,10 @@ import { FileResponse } from "./route.schema";
 import { File } from "@server/model";
 import { prisma } from "@server/db/client";
 import { withSession } from "@server/decorator";
-import { createDriveService } from "@server/service";
+import { driveV3 } from "@server/service";
 import moment from "moment";
 
 export const PATCH = withSession(async (request) => {
-  const service = await createDriveService(request.session.user.id);
-
   const body = await request.req.json();
   const nextParams: { fileId: string } = request.params.params;
   const { fileId } = nextParams;
@@ -97,7 +95,7 @@ export const PATCH = withSession(async (request) => {
       resource: body,
     };
 
-    await service.files.update(fileUpdateData);
+    await driveV3.files.update(fileUpdateData);
 
     const file = await prisma.file.findFirst({
       where: {
@@ -131,8 +129,6 @@ export const PATCH = withSession(async (request) => {
 });
 
 export const DELETE = withSession(async (request) => {
-  const service = await createDriveService(request.session.user.id);
-
   const nextParams: { fileId: string } = request.params.params;
   const { fileId } = nextParams;
 
@@ -192,7 +188,7 @@ export const DELETE = withSession(async (request) => {
     );
   }
 
-  await service.files.delete({
+  await driveV3.files.delete({
     fileId: fileId,
   });
 

src/app/api/file/route.ts

@@ -3,17 +3,14 @@ import { FileResponse } from "./route.schema";
 import { File } from "@server/model";
 import { prisma } from "@server/db/client";
 import { withSession } from "@server/decorator";
-import { createDriveService } from "@server/service";
+import { driveV3 } from "@server/service";
 import moment from "moment";
 
 export const POST = withSession(async (request) => {
-  const service = await createDriveService(request.session.user.id);
-
   const body = await request.req.json();
   const fileRequest = File.safeParse(body);
 
   if (!fileRequest.success) {
-    console.log(fileRequest.error);
     return NextResponse.json(
       FileResponse.parse({
         code: "INVALID_REQUEST",
@@ -83,10 +80,9 @@ export const POST = withSession(async (request) => {
     };
 
     // NOTE: File will still be created on Drive even if it fails on MongoDB
-    const file = await service.files.create(fileCreateData);
-
+    // TOOD(nickbar01234) - Handle failure
+    const file = await driveV3.files.create(fileCreateData);
     const googleFileId = file.data.id;
-
     // If the data is valid, save it to the database via prisma client
     await prisma.file.create({
       data: {

src/app/api/handle-chapter-request/route.ts

@@ -4,11 +4,11 @@ import {
   HandleChapterRequestResponse,
 } from "./route.schema";
 import { withSession } from "@server/decorator";
-import { createDriveService } from "@server/service";
+import { driveV3 } from "@server/service";
 import { env } from "@env/server.mjs";
 import { prisma } from "@server/db/client";
 
-export const POST = withSession(async ({ req, session }) => {
+export const POST = withSession(async ({ req }) => {
   const handleChapterRequest = HandleChapterRequest.safeParse(await req.json());
   if (!handleChapterRequest.success) {
     return NextResponse.json(
@@ -73,8 +73,7 @@ export const POST = withSession(async ({ req, session }) => {
       fields: "id",
     };
 
-    const service = await createDriveService(session.user.id);
-    const file = await service.files.create(fileCreateData);
+    const file = await driveV3.files.create(fileCreateData);
     const googleFolderId = file.data.id as string;
 
     await prisma.chapter.update({

src/app/api/senior/route.client.ts

@@ -1,10 +1,9 @@
+import { TypedRequest } from "@server/type";
 import { seniorPostResponse, IPostSeniorRequestSchema } from "./route.schema";
 
-interface IPostSeniorRequest extends Omit<RequestInit, "body"> {
-  body: IPostSeniorRequestSchema;
-}
-
-export const postSenior = async (request: IPostSeniorRequest) => {
+export const postSenior = async (
+  request: TypedRequest<IPostSeniorRequestSchema>
+) => {
   const { body, ...options } = request;
 
   const response = await fetch(`/api/senior/`, {

src/app/api/senior/route.ts

@@ -2,7 +2,7 @@ import { withSessionAndRole } from "@server/decorator";
 import { NextResponse } from "next/server";
 import { seniorPostResponse, postSeniorSchema } from "./route.schema";
 import { prisma } from "@server/db/client";
-import { createDriveService } from "@server/service";
+import { driveV3 } from "@server/service";
 
 // @TODO - Use google drive service to create folder
 export const POST = withSessionAndRole(
@@ -83,11 +83,7 @@ export const POST = withSessionAndRole(
         fields: "id",
       };
 
-      const service = await createDriveService(session.user.id);
-
-      const file = await (service as NonNullable<typeof service>).files.create(
-        fileCreateData
-      );
+      const file = await driveV3.files.create(fileCreateData);
       const googleFolderId = (file as any).data.id;
 
       await prisma.senior.update({

src/app/api/user-request/route.ts

@@ -7,7 +7,7 @@ import {
 } from "./route.schema";
 import { prisma } from "@server/db/client";
 import { withSession } from "@server/decorator/index";
-import { createDriveService } from "@server/service";
+import { driveV3 } from "@server/service";
 
 export const POST = withSession(async ({ req, session }) => {
   try {
@@ -194,7 +194,6 @@ export const PATCH = withSession(async ({ req, session }) => {
 
   // Next, share the folder with the user that is accepted
   const shareFolder = async (folderId: string, userEmail: string) => {
-    const service = await createDriveService(session.user.id);
     // Define the permission
     const permission = {
       type: "user",
@@ -203,13 +202,27 @@ export const PATCH = withSession(async ({ req, session }) => {
     };
 
     // Share the folder
-    await service.permissions.create({
+    return await driveV3.permissions.create({
       fileId: folderId,
+      sendNotificationEmail: false,
       requestBody: permission,
     });
   };
   // Since we use Google login, they must have an email
-  await shareFolder(folderId, chapterRequest.user.email ?? "");
+  const permission = await shareFolder(
+    folderId,
+    chapterRequest.user.email ?? ""
+  );
+  // TODO(nickbar01234) - Handle failure
+  const permissionId = permission.data.id as string;
+  await prisma.chapter.update({
+    where: { id: chapterRequest.chapterId },
+    data: {
+      permissions: {
+        push: permissionId,
+      },
+    },
+  });
   // We update the chapter ID second to allow the user to rejoin in the case that shareFolder fails midway
   await prisma.user.update({
     where: { id: chapterRequest.uid },

src/app/private/chapter-leader/seniors/page.tsx

@@ -19,12 +19,7 @@ const UserSeniorsPage = async () => {
   const seniors = chapter?.seniors.sort(compareSenior) ?? [];
   const students = chapter?.students ?? [];
 
-  return (
-    <>
-      <div className="mb-6 text-2xl">Seniors {`(${seniors.length})`}</div>
-      <SeniorView seniors={seniors} students={students} />
-    </>
-  );
+  return <SeniorView seniors={seniors} students={students} />;
 };
 
 export default UserSeniorsPage;

src/app/private/user/home/page.tsx

@@ -4,36 +4,40 @@ import { getServerSessionOrRedirect } from "@server/utils";
 
 const UserHomePage = async () => {
   const session = await getServerSessionOrRedirect();
-  const chapter = await prisma.chapter.findFirstOrThrow({
-    where: {
-      id: session.user?.ChapterID ?? "",
-    },
-    include: {
-      students: {
-        where: {
-          OR: [
-            {
-              position: {
-                not: "",
+  if (session.user?.ChapterID != null) {
+    const chapter = await prisma.chapter.findFirstOrThrow({
+      where: {
+        id: session.user?.ChapterID ?? "",
+      },
+      include: {
+        students: {
+          where: {
+            OR: [
+              {
+                position: {
+                  not: "",
+                },
+              },
+              {
+                role: "CHAPTER_LEADER",
               },
-            },
-            {
-              role: "CHAPTER_LEADER",
-            },
-          ],
+            ],
+          },
         },
       },
-    },
-  });
-  const resources = await prisma.resource.findMany({
-    where: {
-      access: {
-        isEmpty: true,
+    });
+    const resources = await prisma.resource.findMany({
+      where: {
+        access: {
+          isEmpty: true,
+        },
       },
-    },
-  });
+    });
 
-  return <DisplayChapterInfo chapter={chapter} resources={resources} />;
+    return <DisplayChapterInfo chapter={chapter} resources={resources} />;
+  } else {
+    return null;
+  }
 };
 
 export default UserHomePage;