Adjust external api id middleware for admin routes

Signed-off-by: Jason Sherman <[email protected]>
usingtechnology · Aug 22, 2024 · 3b76182 · 3b76182
1 parent 0d49e8d
commit 3b76182
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/app/src/forms/common/middleware/validateParameter.js b/app/src/forms/common/middleware/validateParameter.js
@@ -93,12 +93,19 @@ const validateExternalAPIId = async (req, _res, next, externalAPIId) => {
     _validateUuid(externalAPIId, 'externalAPIId');
 
     const externalApi = await externalApiService.readExternalAPI(externalAPIId);
-    if (!externalApi || externalApi.formId !== req.params.formId) {
+    if (!externalApi) {
       throw new Problem(404, {
-        detail: 'externalAPIId does not exist on this form',
+        detail: 'externalAPIId does not exist',
       });
     }
-
+    // perform this check only if there is a formId (admin routes don't have form id)
+    if (req.params.formId) {
+      if (!externalApi || externalApi.formId !== req.params.formId) {
+        throw new Problem(404, {
+          detail: 'externalAPIId does not exist on this form',
+        });
+      }
+    }
     next();
   } catch (error) {
     next(error);

diff --git a/app/tests/unit/forms/common/middleware/validateParameter.spec.js b/app/tests/unit/forms/common/middleware/validateParameter.spec.js
@@ -290,7 +290,8 @@ describe('validateExternalApiId', () => {
   describe('404 response when', () => {
     const expectedStatus = { status: 404 };
 
-    test('formId is missing', async () => {
+    test('externalApiId not found', async () => {
+      externalApiService.readExternalAPI.mockReturnValueOnce(null);
       const req = getMockReq({
         params: {
           externalAPIId: externalApiId,
@@ -358,6 +359,20 @@ describe('validateExternalApiId', () => {
       expect(externalApiService.readExternalAPI).toBeCalledTimes(1);
       expect(next).toBeCalledWith();
     });
+
+    test('external api id only', async () => {
+      const req = getMockReq({
+        params: {
+          externalAPIId: externalApiId,
+        },
+      });
+      const { res, next } = getMockRes();
+
+      await validateParameter.validateExternalAPIId(req, res, next, externalApiId);
+
+      expect(externalApiService.readExternalAPI).toBeCalledTimes(1);
+      expect(next).toBeCalledWith();
+    });
   });
 });