Merge pull request #180 from Real-Dev-Squad/develop

Dev to main sync

Author: ankushdharkar

src/constants/responses.ts

@@ -72,3 +72,8 @@ export const OVERDUE_CUSTOM_MESSAGE =
 export const ONBOARDING_DEFAULT_MESSAGE = `You currently have an onboarding status. Please provide an update explaining any challenges you're facing in completing your tasks. If you're finished, consider assigning new tasks to Admin.`;
 
 export const ONBOARDING_CUSTOM_MESSAGE = `Please update your status explaining why you are unable to complete your onboarding tasks within {{days}} days.`;
+
+export const INVALID_TOKEN_FORMAT =
+  "Invalid Authentication header format. Expected 'Bearer <token>'";
+
+export const AUTHENTICATION_ERROR = "Invalid Authentication token";

src/controllers/getMembersInServer.ts

@@ -5,6 +5,7 @@ import { env } from "../typeDefinitions/default.types";
 import JSONResponse from "../utils/JsonResponse";
 import { User } from "../typeDefinitions/user.types";
 import { getMembersInServer } from "../utils/getMembersInServer";
+import { verifyAuthToken } from "../utils/verifyAuthToken";
 
 export const getMembersInServerHandler = async (
   request: IRequest,
@@ -16,10 +17,7 @@ export const getMembersInServerHandler = async (
     return new JSONResponse(response.BAD_SIGNATURE);
   }
   try {
-    const authToken = authHeader.split(" ")[1];
-    await jwt.verify(authToken, env.RDS_SERVERLESS_PUBLIC_KEY, {
-      algorithm: "RS256",
-    });
+    await verifyAuthToken(authHeader, env);
 
     const users = (await getMembersInServer(env)) as User[];
 

src/utils/verifyAuthToken.ts

@@ -1,3 +1,7 @@
+import {
+  AUTHENTICATION_ERROR,
+  INVALID_TOKEN_FORMAT,
+} from "../constants/responses";
 import { env } from "../typeDefinitions/default.types";
 import jwt from "@tsndr/cloudflare-worker-jwt";
 
@@ -8,8 +12,15 @@ import jwt from "@tsndr/cloudflare-worker-jwt";
  */
 
 export async function verifyAuthToken(authHeader: string, env: env) {
-  const authToken = authHeader.split(" ")[1];
-  await jwt.verify(authToken, env.RDS_SERVERLESS_PUBLIC_KEY, {
+  const parts = authHeader.split(" ");
+  if (parts.length !== 2 || parts[0] !== "Bearer") {
+    throw new Error(INVALID_TOKEN_FORMAT);
+  }
+  const authToken = parts[1];
+  const isValid = await jwt.verify(authToken, env.RDS_SERVERLESS_PUBLIC_KEY, {
     algorithm: "RS256",
   });
+  if (!isValid) {
+    throw new Error(AUTHENTICATION_ERROR);
+  }
 }

tests/unit/utils/verifyToken.test.ts

@@ -0,0 +1,47 @@
+import jwt from "@tsndr/cloudflare-worker-jwt";
+import { verifyAuthToken } from "../../../src/utils/verifyAuthToken";
+import {
+  AUTHENTICATION_ERROR,
+  INVALID_TOKEN_FORMAT,
+} from "../../../src/constants/responses";
+
+describe("verifyAuthToken", () => {
+  const authToken = "validToken";
+  const mockEnv = { RDS_SERVERLESS_PUBLIC_KEY: "publicKey" };
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("should verify a valid token successfully", async () => {
+    jwt.verify = jest.fn().mockResolvedValue(true);
+    const authHeader = `Bearer ${authToken}`;
+    await expect(verifyAuthToken(authHeader, mockEnv)).resolves.not.toThrow();
+    expect(jwt.verify).toHaveBeenCalledWith(
+      authToken,
+      mockEnv.RDS_SERVERLESS_PUBLIC_KEY,
+      { algorithm: "RS256" }
+    );
+  });
+
+  it("should throw an error for an invalid token", async () => {
+    const authHeader = "Bearer invalidToken";
+    jwt.verify = jest.fn().mockResolvedValue(false);
+    await expect(verifyAuthToken(authHeader, mockEnv)).rejects.toThrow(
+      AUTHENTICATION_ERROR
+    );
+  });
+  it("should throw an error when Bearer is not passed", async () => {
+    const authHeader = "Beaer invalidToken";
+    await expect(verifyAuthToken(authHeader, mockEnv)).rejects.toThrow(
+      INVALID_TOKEN_FORMAT
+    );
+  });
+
+  it("should throw an error for a malformed auth header", async () => {
+    const malformedHeader = "invalidformat";
+    await expect(verifyAuthToken(malformedHeader, mockEnv)).rejects.toThrow(
+      INVALID_TOKEN_FORMAT
+    );
+  });
+});