fix: handle invalid url (#1000)

koopjs · May 1, 2024 · 593910d · 593910d
1 parent bc7cc8b
commit 593910d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 47 deletions.
diff --git a/.changeset/modern-dryers-hang.md b/.changeset/modern-dryers-hang.md
@@ -0,0 +1,5 @@
+---
+"@koopjs/output-geoservices": patch
+---
+
+- handle MapServer requests with invalid url error
diff --git a/packages/output-geoservices/src/index.js b/packages/output-geoservices/src/index.js
@@ -105,7 +105,7 @@ class GeoServices {
     {
       path: '$namespace/rest/services/$providerParams/MapServer*',
       methods: ['get', 'post'],
-      handler: 'generalHandler',
+      handler: 'invalidUrlHandler',
     },
   ];
 
@@ -144,13 +144,11 @@ class GeoServices {
     return false;
   }
 
-  async generalHandler(req, res) {
-    try {
-      const data = await this.model.pull(req);
-      return FeatureServer.route(req, res, data);
-    } catch (error) {
-      this.#errorHandler(error, req, res);
-    }
+  async invalidUrlHandler(req, res) {
+    const error = new Error('Invalid URL');
+    error.code = 400;
+    error.details = ['Invalid URL'];
+    this.#errorHandler(error, req, res);
   }
 
   #errorHandler(error, req, res) {

diff --git a/packages/output-geoservices/src/index.spec.js b/packages/output-geoservices/src/index.spec.js
@@ -3,7 +3,6 @@ const FeatureServer = require('@koopjs/featureserver');
 
 jest.mock('@koopjs/featureserver', () => ({
   setLogger: jest.fn(),
-  route: jest.fn(),
   setDefaults: jest.fn(),
   restInfo: jest.fn(),
   serverInfo: jest.fn(),
@@ -98,51 +97,25 @@ describe('Output Geoservices', () => {
         {
           path: '$namespace/rest/services/$providerParams/MapServer*',
           methods: ['get', 'post'],
-          handler: 'generalHandler',
+          handler: 'invalidUrlHandler',
         },
       ]);
     });
   });
 
-  describe('generalHandler', () => {
-    test('should pull data and route', async () => {
+  describe('error handling', () => {
+    test('should handle Invalid URL', async () => {
       const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler({ foo: 'bar' }, resMock);
-      expect(FeatureServer.route.mock.calls.length).toBe(1);
-      expect(FeatureServer.route.mock.calls[0]).toEqual([{ foo: 'bar' }, resMock, 'someData']);
-      expect(modelMock.pull.mock.calls.length).toBe(1);
-      expect(modelMock.pull.mock.calls[0][0]).toEqual({ foo: 'bar' });
-    });
-
-    test('should authorize, then pull data and route', async () => {
-      const modelMock = {
-        pull: jest.fn(async () => 'someData'),
-      };
-      const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler({ foo: 'bar' }, resMock);
-      expect(FeatureServer.route.mock.calls.length).toBe(1);
-      expect(FeatureServer.route.mock.calls[0]).toEqual([{ foo: 'bar' }, resMock, 'someData']);
-    });
-
-    test('should handle 5xx error', async () => {
-      const modelMock = {
-        pull: jest.fn(async () => {
-          const error = new Error('Upstream error');
-          error.code = 503;
-          throw error;
-        }),
-      };
-      const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler(reqMock, resMock);
+      await output.invalidUrlHandler(reqMock, resMock);
       expect(resMock.status.mock.calls[0].length).toBe(1);
       expect(resMock.status.mock.calls[0]).toEqual([200]);
       expect(resMock.json.mock.calls[0].length).toBe(1);
       expect(resMock.json.mock.calls[0]).toEqual([
         {
           error: {
-            code: 503,
-            details: [],
-            message: 'Upstream error',
+            code: 400,
+            details: ['Invalid URL'],
+            message: 'Invalid URL',
           },
         },
       ]);
@@ -155,7 +128,7 @@ describe('Output Geoservices', () => {
         }),
       };
       const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler(reqMock, resMock);
+      await output.queryHandler(reqMock, resMock);
       expect(resMock.status.mock.calls[0].length).toBe(1);
       expect(resMock.status.mock.calls[0]).toEqual([200]);
       expect(resMock.json.mock.calls[0].length).toBe(1);
@@ -179,7 +152,7 @@ describe('Output Geoservices', () => {
         }),
       };
       const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler(reqMock, resMock);
+      await output.queryHandler(reqMock, resMock);
       expect(resMock.status.mock.calls[0].length).toBe(1);
       expect(resMock.status.mock.calls[0]).toEqual([200]);
       expect(resMock.json.mock.calls[0].length).toBe(1);
@@ -204,7 +177,7 @@ describe('Output Geoservices', () => {
         }),
       };
       const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler({ headers: { authorization: '123' } }, resMock);
+      await output.queryHandler({ headers: { authorization: '123' } }, resMock);
       expect(resMock.status.mock.calls[0].length).toBe(1);
       expect(resMock.status.mock.calls[0]).toEqual([200]);
       expect(resMock.json.mock.calls[0].length).toBe(1);
@@ -228,7 +201,7 @@ describe('Output Geoservices', () => {
         }),
       };
       const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler({ headers: { authorization: '123' } }, resMock);
+      await output.queryHandler({ headers: { authorization: '123' } }, resMock);
       expect(resMock.status.mock.calls[0].length).toBe(1);
       expect(resMock.status.mock.calls[0]).toEqual([200]);
       expect(resMock.json.mock.calls[0].length).toBe(1);
@@ -251,7 +224,7 @@ describe('Output Geoservices', () => {
         }),
       };
       const output = new OutputGeoServices(modelMock, { logger: loggerMock });
-      await output.generalHandler(reqMock, resMock);
+      await output.queryHandler(reqMock, resMock);
       expect(resMock.status.mock.calls[0].length).toBe(1);
       expect(resMock.status.mock.calls[0]).toEqual([200]);
       expect(resMock.json.mock.calls[0].length).toBe(1);