fix: handle Oas with a server URL that has no host or domain (#437)

* fix: handle Oas spec with a server URL that has no host or domain * chore: update package-lock
readmeio · May 19, 2021 · 6e3aca1 · 6e3aca1
1 parent 623d1be
commit 6e3aca1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/__tests__/tooling/index.test.js b/__tests__/tooling/index.test.js
@@ -54,6 +54,10 @@ describe('#url([selected])', () => {
     expect(new Oas({ servers: [{ url: 'https://example.com' }] }).url(10)).toBe('https://example.com');
   });
 
+  it('should make example.com the origin if none is present', () => {
+    expect(new Oas({ servers: [{ url: '/api/v3' }] }).url()).toBe('https://example.com/api/v3');
+  });
+
   describe('server variables', () => {
     const oas = new Oas({
       servers: [

diff --git a/package-lock.json b/package-lock.json
diff --git a/tooling/index.js b/tooling/index.js
@@ -30,6 +30,7 @@ function stripTrailingSlash(url) {
 }
 
 function normalizedUrl(oas, selected) {
+  const exampleDotCom = 'https://example.com';
   let url;
   try {
     url = oas.servers[selected].url;
@@ -38,8 +39,16 @@ function normalizedUrl(oas, selected) {
 
     // Stripping the '/' off the end
     url = stripTrailingSlash(url);
+
+    // RM-1044 Check if the URL is just a path a missing an origin, for example `/api/v3`
+    // If so, then make example.com the origin to avoid it becoming something invalid like https:///api/v3
+    if (url.startsWith('/') && !url.startsWith('//')) {
+      const urlWithOrigin = new URL(exampleDotCom);
+      urlWithOrigin.pathname = url;
+      url = urlWithOrigin.href;
+    }
   } catch (e) {
-    url = 'https://example.com';
+    url = exampleDotCom;
   }
 
   return ensureProtocol(url);