fix: Swagger server url transform (#1934)

* Fix transformation of swagger servers urls

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Fix bug in tests with undefined swagger version

Signed-off-by: Carson Cook <carson.cook@ibm.com>

* Add test for swagger server url transform

Signed-off-by: Carson Cook <carson.cook@ibm.com>

Author: CarsonCook

api-catalog-ui/frontend/src/components/Swagger/Swagger.jsx

@@ -9,8 +9,14 @@ function transformSwaggerToCurrentHost(swagger) {
 
     if (swagger.servers !== null && swagger.servers !== undefined) {
         for (let i = 0; i < swagger.servers.length; i += 1) {
-            const url = `${window.location.protocol}//${window.location.host}/${swagger.servers[i].url}`;
-            swagger.servers[i].url = url;
+            const location = `${window.location.protocol}//${window.location.host}`;
+            try {
+                const swaggerUrl = new URL(swagger.servers[i].url);
+                swagger.servers[i].url = location + swaggerUrl.pathname;
+            } catch (e) {
+                // not a proper url, assume it is an endpoint
+                swagger.servers[i].url = location + swagger.servers[i];
+            }
         }
     }
 
@@ -71,7 +77,7 @@ export default class SwaggerUI extends Component {
         try {
             // If no version selected use the default apiDoc
             if (
-                selectedVersion === null &&
+                (selectedVersion === null || selectedVersion === undefined) &&
                 selectedService.apiDoc !== null &&
                 selectedService.apiDoc !== undefined &&
                 selectedService.apiDoc.length !== 0
@@ -85,7 +91,7 @@ export default class SwaggerUI extends Component {
                     plugins: [this.customPlugins],
                 });
             }
-            if (selectedVersion !== null) {
+            if (selectedVersion !== null && selectedVersion !== undefined) {
                 const url = `${process.env.REACT_APP_GATEWAY_URL +
                     process.env.REACT_APP_CATALOG_HOME +
                     process.env.REACT_APP_APIDOC_UPDATE}/${selectedService.serviceId}/${selectedVersion}`;

api-catalog-ui/frontend/src/components/Swagger/Swagger.test.jsx

@@ -1,6 +1,8 @@
 /* eslint-disable no-undef */
 import { shallow } from 'enzyme';
 import SwaggerUI from './Swagger';
+import { act } from "react-dom/test-utils";
+import { render } from 'react-dom';
 
 describe('>>> Swagger component tests', () => {
     it('should not render swagger if apiDoc is null', () => {
@@ -16,11 +18,37 @@ describe('>>> Swagger component tests', () => {
         };
         const wrapper = shallow(
             <div>
-                <SwaggerUI service={service} />
+                <SwaggerUI selectedService={service} />
             </div>
         );
         const swaggerDiv = wrapper.find('#swaggerContainer');
 
         expect(swaggerDiv.length).toEqual(0);
     });
+
+    it('should transform swagger server url', async () => {
+        const endpoint = '/enabler/api/v1';
+        const service = {
+            serviceId: 'testservice',
+            title: 'Spring Boot Enabler Service',
+            description: 'Dummy Service for enabling others',
+            status: 'UP',
+            secured: false,
+            homePageUrl: 'http://localhost:10013/enabler/',
+            basePath: '/enabler/api/v1',
+            apiDoc: JSON.stringify({
+                openapi: "3.0.0",
+                servers: [{url: 'https://bad.com' + endpoint}],
+            }),
+            apiId: {
+                default: 'enabler'
+            }
+        };
+
+        const container = document.createElement('div');
+        document.body.appendChild(container);
+
+        await act(async () => render(<SwaggerUI selectedService={service}/>, container));
+        expect(container.textContent).toContain('Servershttp://localhost' + endpoint);
+    });
 });