fix: two auth bugs (#980)

* fix: auth bugs
koopjs · Apr 19, 2024 · 90228e9 · 90228e9
1 parent 5cb4c20
commit 90228e9
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 11 deletions.
diff --git a/.changeset/rich-numbers-judge.md b/.changeset/rich-numbers-judge.md
@@ -0,0 +1,5 @@
+---
+"@koopjs/koop-core": patch
+---
+
+- auth error code can be set from provider but defaults to 401
diff --git a/.changeset/silver-eagles-explain.md b/.changeset/silver-eagles-explain.md
@@ -0,0 +1,5 @@
+---
+"@koopjs/output-geoservices": patch
+---
+
+- owningSystemUrl inclusion is a constructor option
diff --git a/packages/core/src/data-provider/extend-model.js b/packages/core/src/data-provider/extend-model.js
@@ -205,7 +205,7 @@ module.exports = function extendModel(
       try {
         await this.authorize(req);
       } catch (error) {
-        error.code = 401;
+        error.code = error.code || 401;
         return { error };
       }
 

diff --git a/packages/output-geoservices/README.md b/packages/output-geoservices/README.md
@@ -69,6 +69,9 @@ You can leverage your own custom logger instance, but it must adhere to the Wins
 }
 ```
 
+### `includeOwningSystemUrl (boolean)`
+If `true`, adds `owningSystemUrl` to the `rest/info` response.  Defaults to false.
+
 ## Routes
 
 ```js

diff --git a/packages/output-geoservices/src/index.js b/packages/output-geoservices/src/index.js
@@ -42,6 +42,7 @@ class GeoServices {
   #useHttpForTokenUrl = false;
   #authInfo;
   #logger;
+  #includeOwningSystemUrl;
 
   static type = 'output';
   static version = require('../package.json').version;
@@ -95,6 +96,7 @@ class GeoServices {
       isTokenBasedSecurity: true,
     };
 
+    this.#includeOwningSystemUrl = options.includeOwningSystemUrl || false;
     this.#useHttpForTokenUrl = this.#getHttpSetting(options, model);
 
     FeatureServer.setLogger({ logger: this.#logger });
@@ -177,10 +179,13 @@ class GeoServices {
       authInfo.tokenServicesUrl = this.#buildTokensUrl(req.headers.host, req.baseUrl);
     }
 
-    FeatureServer.route(req, res, {
-      owningSystemUrl: this.#buildOwningSystemUrl(req.headers.host, req.baseUrl),
-      authInfo,
-    });
+    const data = { authInfo };
+
+    if (this.#includeOwningSystemUrl) {
+      data.owningSystemUrl = this.#buildOwningSystemUrl(req.headers.host, req.baseUrl);
+    }
+
+    FeatureServer.route(req, res, data);
   }
 
   #buildTokensUrl(host, baseUrl) {

diff --git a/packages/output-geoservices/src/index.spec.js b/packages/output-geoservices/src/index.spec.js
@@ -261,7 +261,6 @@ describe('Output Geoservices', () => {
         reqMock,
         resMock,
         {
-          owningSystemUrl: 'https://some-host.com/api/v1/provider-name',
           authInfo: { food: 'baz' },
         },
       ]);
@@ -279,7 +278,6 @@ describe('Output Geoservices', () => {
         reqMock,
         resMock,
         {
-          owningSystemUrl: 'https://some-host.com/api/v1/provider-name',
           authInfo: {
             isTokenBasedSecurity: true,
             tokenServicesUrl: 'https://some-host.com/api/v1/provider-name/rest/generateToken',
@@ -302,7 +300,6 @@ describe('Output Geoservices', () => {
         reqMock,
         resMock,
         {
-          owningSystemUrl: 'http://some-host.com/api/v1/provider-name',
           authInfo: {
             isTokenBasedSecurity: true,
             tokenServicesUrl: 'http://some-host.com/api/v1/provider-name/rest/generateToken',
@@ -325,7 +322,6 @@ describe('Output Geoservices', () => {
           reqMock,
           resMock,
           {
-            owningSystemUrl: 'http://some-host.com/api/v1/provider-name',
             authInfo: {
               isTokenBasedSecurity: true,
               tokenServicesUrl: 'http://some-host.com/api/v1/provider-name/rest/generateToken',
@@ -353,7 +349,6 @@ describe('Output Geoservices', () => {
           reqMock,
           resMock,
           {
-            owningSystemUrl: 'http://some-host.com/api/v1/provider-name',
             authInfo: {
               isTokenBasedSecurity: true,
               tokenServicesUrl: 'http://some-host.com/api/v1/provider-name/rest/generateToken',
@@ -383,14 +378,38 @@ describe('Output Geoservices', () => {
         reqMock,
         resMock,
         {
-          owningSystemUrl: 'http://some-host.com/api/v1/provider-name',
           authInfo: {
             isTokenBasedSecurity: true,
             tokenServicesUrl: 'http://some-host.com/api/v1/provider-name/rest/generateToken',
           },
         },
       ]);
     });
+
+    test('should include owningSystemUrl', async () => {
+      const modelMock = {
+        namespace: 'provider-name',
+        pull: jest.fn(async () => 'someData'),
+        authenticationSpecification: () => {
+          return {};
+        },
+      };
+
+      const output = new OutputGeoServices(modelMock, { includeOwningSystemUrl: true });
+      await output.restInfoHandler(reqMock, resMock);
+      expect(FeatureServer.route.mock.calls.length).toBe(1);
+      expect(FeatureServer.route.mock.calls[0]).toEqual([
+        reqMock,
+        resMock,
+        {
+          owningSystemUrl: 'https://some-host.com/api/v1/provider-name',
+          authInfo: {
+            isTokenBasedSecurity: true,
+            tokenServicesUrl: 'https://some-host.com/api/v1/provider-name/rest/generateToken',
+          },
+        },
+      ]);
+    });
   });
 
   describe('generateToken', () => {
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     ```
+    ### `includeOwningSystemUrl (boolean)`
+    If `true`, adds `owningSystemUrl` to the `rest/info` response.  Defaults to false.
     ## Routes
     ```js
@@ Expand Down @@