fix unit tests (finally)

Author: devksingh4

package.json

@@ -34,6 +34,7 @@
     "@eslint/js": "^9.25.1",
     "@playwright/test": "^1.52.0",
     "@tsconfig/node22": "^22.0.1",
+    "@types/ioredis-mock": "^8.2.5",
     "@types/node": "^22.15.2",
     "@types/pluralize": "^0.0.33",
     "@types/react": "^19.1.2",
@@ -63,6 +64,7 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "husky": "^9.1.4",
     "identity-obj-proxy": "^3.0.0",
+    "ioredis-mock": "^8.9.0",
     "jsdom": "^26.1.0",
     "node-ical": "^0.20.1",
     "postcss": "^8.5.3",
@@ -85,4 +87,4 @@
   "resolutions": {
     "pdfjs-dist": "^4.8.69"
   }
-}
+}

src/api/plugins/auth.ts

@@ -264,7 +264,7 @@ const authPlugin: FastifyPluginAsync = async (fastify, _options) => {
           verifiedTokenData.sub;
         const expectedRoles = new Set(validRoles);
         const cachedRoles = await fastify.redisClient.get(
-          `authCache:${verifiedTokenData.sub}:roles`,
+          `authCache:${request.username}:roles`,
         );
         if (cachedRoles) {
           request.userRoles = new Set(JSON.parse(cachedRoles));
@@ -318,7 +318,7 @@ const authPlugin: FastifyPluginAsync = async (fastify, _options) => {
           }
           request.userRoles = userRoles;
           fastify.redisClient.set(
-            `authCache:${verifiedTokenData.sub}:roles`,
+            `authCache:${request.username}:roles`,
             JSON.stringify([...userRoles]),
             "EX",
             AUTH_DECISION_CACHE_SECONDS,

tests/unit/apiKey.test.ts

@@ -2,12 +2,8 @@ import { afterAll, expect, test, beforeEach, vi, describe } from "vitest";
 import { mockClient } from "aws-sdk-client-mock";
 import init from "../../src/api/index.js";
 import { createJwt } from "./auth.test.js";
-import { secretJson, secretObject } from "./secret.testdata.js";
+import { secretObject } from "./secret.testdata.js";
 import supertest from "supertest";
-import {
-  GetSecretValueCommand,
-  SecretsManagerClient,
-} from "@aws-sdk/client-secrets-manager";
 import {
   ConditionalCheckFailedException,
   DynamoDBClient,
@@ -32,7 +28,6 @@ vi.mock("../../src/api/functions/apiKey.js", () => {
 
 // Mock DynamoDB client
 const dynamoMock = mockClient(DynamoDBClient);
-const smMock = mockClient(SecretsManagerClient);
 const jwt_secret = secretObject["jwt_key"];
 
 vi.stubEnv("JwtSigningKey", jwt_secret);
@@ -42,13 +37,8 @@ const app = await init();
 describe("API Key Route Tests", () => {
   beforeEach(() => {
     dynamoMock.reset();
-    smMock.reset();
     vi.clearAllMocks();
 
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
-
     dynamoMock.on(TransactWriteItemsCommand).resolves({});
 
     dynamoMock.on(ScanCommand).resolves({

tests/unit/auth.test.ts

@@ -1,12 +1,7 @@
 import { expect, test, vi } from "vitest";
-import {
-  GetSecretValueCommand,
-  SecretsManagerClient,
-} from "@aws-sdk/client-secrets-manager";
 import { mockClient } from "aws-sdk-client-mock";
 import init from "../../src/api/index.js";
 import {
-  secretJson,
   secretObject,
   jwtPayload,
   jwtPayloadNoGroups,
@@ -15,8 +10,6 @@ import jwt from "jsonwebtoken";
 import { allAppRoles, AppRoles } from "../../src/common/roles.js";
 import { beforeEach, describe } from "node:test";
 
-const ddbMock = mockClient(SecretsManagerClient);
-
 const app = await init();
 const jwt_secret = secretObject["jwt_key"];
 export function createJwt(date?: Date, groups?: string[], email?: string) {
@@ -54,9 +47,6 @@ const testJwtNoGroups = createJwtNoGroups();
 
 describe("Test authentication", () => {
   test("Test happy path", async () => {
-    ddbMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
     const response = await app.inject({
       method: "GET",
       url: "/api/v1/protected",
@@ -73,9 +63,6 @@ describe("Test authentication", () => {
   });
 
   test("Test user-specific role grants", async () => {
-    ddbMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
     const response = await app.inject({
       method: "GET",
       url: "/api/v1/protected",
@@ -93,5 +80,6 @@ describe("Test authentication", () => {
 
   beforeEach(() => {
     (app as any).nodeCache.flushAll();
+    (app as any).redisClient.flushAll();
   });
 });

tests/unit/discordEvent.test.ts

@@ -3,17 +3,12 @@ import { DynamoDBClient, PutItemCommand } from "@aws-sdk/client-dynamodb";
 import { mockClient } from "aws-sdk-client-mock";
 import init from "../../src/api/index.js";
 import { createJwt } from "./auth.test.js";
-import { secretJson, secretObject } from "./secret.testdata.js";
+import { secretObject } from "./secret.testdata.js";
 import supertest from "supertest";
 import { describe } from "node:test";
-import {
-  GetSecretValueCommand,
-  SecretsManagerClient,
-} from "@aws-sdk/client-secrets-manager";
 import { updateDiscord } from "../../src/api/functions/discord.js";
 
 const ddbMock = mockClient(DynamoDBClient);
-const smMock = mockClient(SecretsManagerClient);
 
 const jwt_secret = secretObject["jwt_key"];
 vi.stubEnv("JwtSigningKey", jwt_secret);
@@ -33,9 +28,6 @@ const app = await init();
 describe("Test Events <-> Discord integration", () => {
   test("Happy path: valid publish submission.", async () => {
     ddbMock.on(PutItemCommand).resolves({});
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
     const testJwt = createJwt();
     await app.ready();
     const response = await supertest(app.server)
@@ -57,9 +49,6 @@ describe("Test Events <-> Discord integration", () => {
 
   test("Happy path: do not publish repeating events.", async () => {
     ddbMock.on(PutItemCommand).resolves({});
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
     const testJwt = createJwt();
     await app.ready();
     const response = await supertest(app.server)
@@ -87,7 +76,6 @@ describe("Test Events <-> Discord integration", () => {
   beforeEach(() => {
     (app as any).nodeCache.flushAll();
     ddbMock.reset();
-    smMock.reset();
     vi.clearAllMocks();
     vi.useFakeTimers();
   });

tests/unit/entraGroupManagement.test.ts

@@ -1,13 +1,8 @@
 import { afterAll, expect, test, beforeEach, vi } from "vitest";
-import { mockClient } from "aws-sdk-client-mock";
 import init from "../../src/api/index.js";
 import { createJwt } from "./auth.test.js";
 import supertest from "supertest";
 import { describe } from "node:test";
-import {
-  GetSecretValueCommand,
-  SecretsManagerClient,
-} from "@aws-sdk/client-secrets-manager";
 import { EntraGroupError } from "../../src/common/errors/index.js";
 
 // Mock required dependencies - their real impl's are defined in the beforeEach section.
@@ -36,17 +31,12 @@ import {
   resolveEmailToOid,
 } from "../../src/api/functions/entraId.js";
 import { EntraGroupActions } from "../../src/common/types/iam.js";
-
-const smMock = mockClient(SecretsManagerClient);
 const app = await init();
 
 describe("Test Modify Group and List Group Routes", () => {
   beforeEach(() => {
     (app as any).nodeCache.flushAll();
     vi.clearAllMocks();
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: JSON.stringify({ jwt_key: "test_jwt_key" }),
-    });
   });
 
   test("Modify group: Add and remove members", async () => {

tests/unit/entraInviteUser.test.ts

@@ -1,14 +1,9 @@
 import { afterAll, expect, test, beforeEach, vi } from "vitest";
-import { mockClient } from "aws-sdk-client-mock";
 import init from "../../src/api/index.js";
 import { createJwt } from "./auth.test.js";
-import { secretJson, secretObject } from "./secret.testdata.js";
+import { secretObject } from "./secret.testdata.js";
 import supertest from "supertest";
 import { describe } from "node:test";
-import {
-  GetSecretValueCommand,
-  SecretsManagerClient,
-} from "@aws-sdk/client-secrets-manager";
 
 vi.mock("../../src/api/functions/entraId.js", () => {
   return {
@@ -28,7 +23,6 @@ import {
 } from "../../src/api/functions/entraId.js";
 import { EntraInvitationError } from "../../src/common/errors/index.js";
 
-const smMock = mockClient(SecretsManagerClient);
 const jwt_secret = secretObject["jwt_key"];
 
 vi.stubEnv("JwtSigningKey", jwt_secret);
@@ -37,9 +31,6 @@ const app = await init();
 
 describe("Test Microsoft Entra ID user invitation", () => {
   test("Emails must end in @illinois.edu.", async () => {
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
     const testJwt = createJwt();
     await app.ready();
 
@@ -56,9 +47,6 @@ describe("Test Microsoft Entra ID user invitation", () => {
     expect(addToTenant).toHaveBeenCalled();
   });
   test("Happy path", async () => {
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
     const testJwt = createJwt();
     await app.ready();
 
@@ -73,9 +61,6 @@ describe("Test Microsoft Entra ID user invitation", () => {
     expect(addToTenant).toHaveBeenCalled();
   });
   test("Happy path", async () => {
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
     const testJwt = createJwt();
     await app.ready();
 

tests/unit/eventPost.test.ts

@@ -8,16 +8,11 @@ import {
 import { mockClient } from "aws-sdk-client-mock";
 import init from "../../src/api/index.js";
 import { createJwt } from "./auth.test.js";
-import {
-  GetSecretValueCommand,
-  SecretsManagerClient,
-} from "@aws-sdk/client-secrets-manager";
 import { secretJson, secretObject } from "./secret.testdata.js";
 import supertest from "supertest";
 import { marshall } from "@aws-sdk/util-dynamodb";
 
 const ddbMock = mockClient(DynamoDBClient);
-const smMock = mockClient(SecretsManagerClient);
 const jwt_secret = secretObject["jwt_key"];
 vi.stubEnv("JwtSigningKey", jwt_secret);
 
@@ -81,9 +76,6 @@ test("Sad path: Prevent empty body request", async () => {
 });
 test("Sad path: Prevent specifying repeatEnds on non-repeating events", async () => {
   ddbMock.on(PutItemCommand).resolves({});
-  smMock.on(GetSecretValueCommand).resolves({
-    SecretString: secretJson,
-  });
   const testJwt = createJwt();
   await app.ready();
   const response = await supertest(app.server)
@@ -112,9 +104,6 @@ test("Sad path: Prevent specifying repeatEnds on non-repeating events", async ()
 
 test("Sad path: Prevent specifying unknown repeat frequencies", async () => {
   ddbMock.on(PutItemCommand).resolves({});
-  smMock.on(GetSecretValueCommand).resolves({
-    SecretString: secretJson,
-  });
   const testJwt = createJwt();
   await app.ready();
   const response = await supertest(app.server)
@@ -144,9 +133,6 @@ test("Sad path: Prevent specifying unknown repeat frequencies", async () => {
 
 test("Happy path: Adding a non-repeating, featured, paid event", async () => {
   ddbMock.on(PutItemCommand).resolves({});
-  smMock.on(GetSecretValueCommand).resolves({
-    SecretString: secretJson,
-  });
   const testJwt = createJwt();
   await app.ready();
   const response = await supertest(app.server)
@@ -176,9 +162,6 @@ test("Happy path: Adding a non-repeating, featured, paid event", async () => {
 
 test("Happy path: Adding a weekly repeating, non-featured, paid event", async () => {
   ddbMock.on(PutItemCommand).resolves({});
-  smMock.on(GetSecretValueCommand).resolves({
-    SecretString: secretJson,
-  });
   const testJwt = createJwt();
   await app.ready();
   const response = await supertest(app.server)
@@ -211,14 +194,8 @@ describe("ETag Lifecycle Tests", () => {
     // Setup
     (app as any).nodeCache.flushAll();
     ddbMock.reset();
-    smMock.reset();
     vi.useFakeTimers();
 
-    // Mock secrets manager
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
-
     // Mock successful DynamoDB operations
     ddbMock.on(PutItemCommand).resolves({});
 
@@ -299,14 +276,8 @@ describe("ETag Lifecycle Tests", () => {
     // Setup
     (app as any).nodeCache.flushAll();
     ddbMock.reset();
-    smMock.reset();
     vi.useFakeTimers();
 
-    // Mock secrets manager
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
-
     // Mock successful DynamoDB operations
     ddbMock.on(PutItemCommand).resolves({});
     ddbMock.on(ScanCommand).resolves({
@@ -397,14 +368,8 @@ describe("ETag Lifecycle Tests", () => {
     // Setup
     (app as any).nodeCache.flushAll();
     ddbMock.reset();
-    smMock.reset();
     vi.useFakeTimers();
 
-    // Mock secrets manager
-    smMock.on(GetSecretValueCommand).resolves({
-      SecretString: secretJson,
-    });
-
     // Mock successful DynamoDB operations
     ddbMock.on(PutItemCommand).resolves({});
 
@@ -538,8 +503,8 @@ afterAll(async () => {
 });
 beforeEach(() => {
   (app as any).nodeCache.flushAll();
+  (app as any).redisClient.flushdb();
   ddbMock.reset();
-  smMock.reset();
   vi.clearAllMocks();
   vi.useFakeTimers();
 });