fix code

Author: devksingh4

src/api/functions/membership.ts

@@ -7,6 +7,7 @@ import { marshall } from "@aws-sdk/util-dynamodb";
 import { genericConfig } from "common/config.js";
 import { FastifyBaseLogger } from "fastify";
 import { isUserInGroup } from "./entraId.js";
+import { EntraGroupError } from "common/errors/index.js";
 
 export async function checkPaidMembership(
   endpoint: string,
@@ -58,7 +59,14 @@ export async function checkPaidMembershipFromEntra(
   entraToken: string,
   paidMemberGroup: string,
 ): Promise<boolean> {
-  return isUserInGroup(entraToken, `${netId}@illinois.edu`, paidMemberGroup);
+  try {
+    return isUserInGroup(entraToken, `${netId}@illinois.edu`, paidMemberGroup);
+  } catch (e) {
+    if (e instanceof EntraGroupError) {
+      return false;
+    }
+    throw e;
+  }
 }
 
 export async function setPaidMembershipInTable(

src/api/functions/validation.ts

@@ -8,5 +8,5 @@ export function validateEmail(email: string): boolean {
 
 export function validateNetId(netId: string): boolean {
   const regex = /^[a-zA-Z]{2}[a-zA-Z\-]*(?:[2-9]|[1-9][0-9]{1,2})?$/;
-  return regex.test(netId);
+  return netId.length <= 8 && regex.test(netId);
 }

tests/live/membership.test.ts

@@ -0,0 +1,48 @@
+import { expect, test, describe } from "vitest";
+
+const baseEndpoint = `https://core.aws.qa.acmuiuc.org`;
+
+describe("Membership API basic checks", async () => {
+  test("Test that getting member succeeds", { timeout: 3000 }, async () => {
+    const response = await fetch(`${baseEndpoint}/api/v1/membership/dsingh14`, {
+      method: "GET",
+    });
+
+    expect(response.status).toBe(200);
+
+    const responseBody = await response.json();
+    expect(responseBody).toStrictEqual({
+      netId: "dsingh14",
+      isPaidMember: true,
+    });
+    expect(response.headers.get("x-acm-data-source")).toBe("dynamo");
+  });
+  test(
+    "Test that getting non-members succeeds",
+    { timeout: 3000 },
+    async () => {
+      const response = await fetch(`${baseEndpoint}/api/v1/membership/zzzz`, {
+        method: "GET",
+      });
+
+      expect(response.status).toBe(200);
+
+      const responseBody = await response.json();
+      expect(responseBody).toStrictEqual({
+        netId: "zzzz",
+        isPaidMember: false,
+      });
+      expect(response.headers.get("x-acm-data-source")).toBe("aad");
+    },
+  );
+  test("Test that invalid NetID is rejected", { timeout: 3000 }, async () => {
+    const response = await fetch(
+      `${baseEndpoint}/api/v1/membership/dsafdsfdsfsdafsfsdfasfsfsfds`,
+      {
+        method: "GET",
+      },
+    );
+
+    expect(response.status).toBe(400);
+  });
+});