update swagger-ui

stoicflame · Mar 14, 2023 · 3f2a290 · 3f2a290
1 parent e8448fc
commit 3f2a290
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 78 deletions.
diff --git a/swagger/swagger-ui/index.css b/swagger/swagger-ui/index.css
@@ -0,0 +1,16 @@
+html {
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: inherit;
+}
+
+body {
+    margin: 0;
+    background: #fafafa;
+}
diff --git a/swagger/swagger-ui/index.html b/swagger/swagger-ui/index.html
@@ -5,75 +5,15 @@
     <meta charset="UTF-8">
     <title>Swagger UI</title>
     <link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
+    <link rel="stylesheet" type="text/css" href="index.css" />
     <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
-    <style>
-      html
-      {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
-      }
-
-      *,
-      *:before,
-      *:after
-      {
-        box-sizing: inherit;
-      }
-
-      body
-      {
-        margin:0;
-        background: #fafafa;
-      }
-    </style>
   </head>
 
   <body>
     <div id="swagger-ui"></div>
-
     <script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
     <script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
-    <script>
-    window.onload = function() {
-      var url = window.location.search.match(/url=([^&]+)/);
-      if (url && url.length > 1) {
-        url = decodeURIComponent(url[1]);
-      }
-      else if (document.location.href.substring(0, 5) === "file:") {
-        url = "../swagger.json";
-      }
-      else {
-        var baseUrl = document.location.href;
-        //this removes the anchor at the end, if there is one
-        baseUrl = baseUrl.substring(0, (baseUrl.indexOf("#") === -1) ? baseUrl.length : baseUrl.indexOf("#"));
-        //this removes the query after the file name, if there is one
-        baseUrl = baseUrl.substring(0, (baseUrl.indexOf("?") === -1) ? baseUrl.length : baseUrl.indexOf("?"));
-        //this removes everything after the last slash in the path
-        baseUrl = baseUrl.substring(0, (baseUrl.lastIndexOf("/") === -1) ? baseUrl.length : baseUrl.lastIndexOf("/"));
-
-        url = baseUrl + "/swagger.json";
-      }
-
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
-        url: url,
-        dom_id: '#swagger-ui',
-        deepLinking: true,
-        presets: [
-          SwaggerUIBundle.presets.apis,
-          SwaggerUIStandalonePreset
-        ],
-        plugins: [
-          SwaggerUIBundle.plugins.DownloadUrl
-        ],
-        layout: "StandaloneLayout"
-      });
-      // End Swagger UI call region
-
-      window.ui = ui;
-    };
-  </script>
+    <script src="./swagger-initializer.js" charset="UTF-8"> </script>
   </body>
 </html>
diff --git a/swagger/swagger-ui/oauth2-redirect.html b/swagger/swagger-ui/oauth2-redirect.html
@@ -13,7 +13,7 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
@@ -38,7 +38,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -58,7 +58,7 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {

diff --git a/swagger/swagger-ui/swagger-initializer.js b/swagger/swagger-ui/swagger-initializer.js
@@ -0,0 +1,38 @@
+window.onload = function() {
+  //<editor-fold desc="Changeable Configuration Block">
+  let url = window.location.search.match(/url=([^&]+)/);
+  if (url && url.length > 1) {
+    url = decodeURIComponent(url[1]);
+  }
+  else if (document.location.href.substring(0, 5) === "file:") {
+    url = "../openapi.json";
+  }
+  else {
+    var baseUrl = document.location.href;
+    //this removes the anchor at the end, if there is one
+    baseUrl = baseUrl.substring(0, (baseUrl.indexOf("#") === -1) ? baseUrl.length : baseUrl.indexOf("#"));
+    //this removes the query after the file name, if there is one
+    baseUrl = baseUrl.substring(0, (baseUrl.indexOf("?") === -1) ? baseUrl.length : baseUrl.indexOf("?"));
+    //this removes everything after the last slash in the path
+    baseUrl = baseUrl.substring(0, (baseUrl.lastIndexOf("/") === -1) ? baseUrl.length : baseUrl.lastIndexOf("/"));
+
+    url = baseUrl + "/openapi.json";
+  }
+
+  // the following lines will be replaced by docker/configurator, when it runs in a docker-container
+  window.ui = SwaggerUIBundle({
+    url: url,
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  });
+
+  //</editor-fold>
+};
diff --git a/swagger/swagger-ui/swagger-ui-bundle.js b/swagger/swagger-ui/swagger-ui-bundle.js
diff --git a/swagger/swagger-ui/swagger-ui-bundle.js.map b/swagger/swagger-ui/swagger-ui-bundle.js.map
diff --git a/swagger/swagger-ui/swagger-ui-es-bundle-core.js b/swagger/swagger-ui/swagger-ui-es-bundle-core.js
diff --git a/swagger/swagger-ui/swagger-ui-es-bundle-core.js.map b/swagger/swagger-ui/swagger-ui-es-bundle-core.js.map
diff --git a/swagger/swagger-ui/swagger-ui-es-bundle.js b/swagger/swagger-ui/swagger-ui-es-bundle.js
diff --git a/swagger/swagger-ui/swagger-ui-es-bundle.js.map b/swagger/swagger-ui/swagger-ui-es-bundle.js.map
diff --git a/swagger/swagger-ui/swagger-ui-standalone-preset.js b/swagger/swagger-ui/swagger-ui-standalone-preset.js
diff --git a/swagger/swagger-ui/swagger-ui-standalone-preset.js.map b/swagger/swagger-ui/swagger-ui-standalone-preset.js.map
diff --git a/swagger/swagger-ui/swagger-ui.css b/swagger/swagger-ui/swagger-ui.css
diff --git a/swagger/swagger-ui/swagger-ui.css.map b/swagger/swagger-ui/swagger-ui.css.map
diff --git a/swagger/swagger-ui/swagger-ui.js b/swagger/swagger-ui/swagger-ui.js
diff --git a/swagger/swagger-ui/swagger-ui.js.map b/swagger/swagger-ui/swagger-ui.js.map