Fixed server-url issues and response with plain-text content-type

rapi-doc · May 29, 2019 · 7f22f69 · 7f22f69
1 parent 1b0db2e
commit 7f22f69
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 18 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -18,7 +18,7 @@
   -->
 
   <rapi-doc
-    spec-url="./examples/specs/petstore3.yaml"
+    spec-url="./examples/specs/petstore.json"
     layout="row"
     theme="dark"
   >

diff --git a/dist/index.html.gz b/dist/index.html.gz
diff --git a/dist/rapidoc-min.js b/dist/rapidoc-min.js
diff --git a/dist/rapidoc-min.js.gz b/dist/rapidoc-min.js.gz
diff --git a/dist/rapidoc-min.js.map b/dist/rapidoc-min.js.map
diff --git a/dist/rapidoc-min.js.map.gz b/dist/rapidoc-min.js.map.gz
diff --git a/dist/report.html b/dist/report.html
diff --git a/docs/rapidoc-min.js b/docs/rapidoc-min.js
diff --git a/index.html b/index.html
@@ -18,7 +18,7 @@
   -->
 
   <rapi-doc
-    spec-url="./examples/specs/petstore3.yaml"
+    spec-url="./examples/specs/petstore.json"
     layout="row"
     theme="dark"
   >

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rapidoc",
-  "version": "5.0.3",
+  "version": "5.0.4",
   "description": "RapiDoc - Open API spec viewer with built in console",
   "author": "Mrinmoy Majumdar <[email protected]>",
   "repository": {

diff --git a/src/components/api-request.js b/src/components/api-request.js
@@ -654,6 +654,11 @@ export default class ApiRequest extends LitElement {
             me.responseBlobUrl = URL.createObjectURL(respBlob);
           })
         }
+        else {
+          resp.text().then(function(respText) {
+            me.responseText = respText;
+          })
+        }
       }
       else{
         resp.text().then(function(respText) {

diff --git a/src/utils/parse-utils.js b/src/utils/parse-utils.js
@@ -163,13 +163,22 @@ export default async function ProcessSpec(specUrl){
   securitySchemes = (openApiSpec.components? openApiSpec.components.securitySchemes:{});
   if (openApiSpec.servers){
     openApiSpec.servers.map(function(v){
-      if (v.url && v.url.substr(0,1) === "/"){
-        let paths = specUrl.split("/");
-        v.url = paths[0]+"//"+paths[2]+v.url;
+      let tempUrl = v.url.trim().toLowerCase();
+      if (v.url && tempUrl.substr(0,4) !== 'http') {
+        if (tempUrl.substr(0,2)=='//') {
+          v.url = location.protocol + v.url;
+        }
+        else{
+          v.url = location.origin + v.url;
+        }
       }
     })
   }
+  else{
+    openApiSpec.servers = [{'url':location.origin}];
+  }
   servers = openApiSpec.servers;
+
   tags.sort((a, b) =>  (a.name < b.name ? -1 : (a.name > b.name ? 1: 0)) );
   let parsedSpec = {
     "info"    : openApiSpec.info,