Upgrade Swagger UI to 5.22.0 and added WDSPRx.yaml to resources

2026-07-23 02:24:16 -04:00 · 2025-05-29 15:10:16 +02:00
parent 28077752a9
commit 76b4623375
17 changed files with 74 additions and 56 deletions
@@ -135,10 +135,12 @@
        <file>webapi/doc/swagger/include/VORLocalizer.yaml</file>
        <file>webapi/doc/swagger/include/WFMDemod.yaml</file>
        <file>webapi/doc/swagger/include/WFMMod.yaml</file>
+        <file>webapi/doc/swagger/include/WDSPRx.yaml</file>
        <file>webapi/doc/swagger/include/Xtrx.yaml</file>
        <file>webapi/doc/swagger-ui/favicon-16x16.png</file>
        <file>webapi/doc/swagger-ui/favicon-32x32.png</file>
        <file>webapi/doc/swagger-ui/index.html</file>
+        <file>webapi/doc/swagger-ui/index.css</file>
        <file>webapi/doc/swagger-ui/oauth2-redirect.html</file>
        <file>webapi/doc/swagger-ui/swagger-ui-bundle.js</file>
        <file>webapi/doc/swagger-ui/swagger-ui-bundle.js.map</file>
@@ -148,6 +150,7 @@
        <file>webapi/doc/swagger-ui/swagger-ui-es-bundle.js.map</file>
        <file>webapi/doc/swagger-ui/swagger-ui-standalone-preset.js.map</file>
        <file>webapi/doc/swagger-ui/swagger-ui-standalone-preset.js</file>
+        <file>webapi/doc/swagger-ui/swagger-initializer.js</file>
        <file>webapi/doc/swagger-ui/swagger-ui.css</file>
        <file>webapi/doc/swagger-ui/swagger-ui.css.map</file>
        <file>webapi/doc/swagger-ui/swagger-ui.js</file>
@@ -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;
+}
@@ -4,35 +4,14 @@
  <head>
    <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="./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>
@@ -4,8 +4,6 @@
    <title>Swagger UI: OAuth2 Redirect</title>
 </head>
 <body>
-</body>
-</html>
 <script>
    'use strict';
    function run () {
@@ -15,31 +13,32 @@
        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);
        }

-        arr = qp.split("&")
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
+        arr = qp.split("&");
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
        qp = qp ? JSON.parse('{' + arr.join() + '}',
                function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value)
+                    return key === "" ? value : decodeURIComponent(value);
                }
-        ) : {}
+        ) : {};

-        isValid = qp.state === sentState
+        isValid = qp.state === sentState;

        if ((
-          oauth2.auth.schema.get("flow") === "accessCode"||
-          oauth2.auth.schema.get("flow") === "authorizationCode"
+          oauth2.auth.schema.get("flow") === "accessCode" ||
+          oauth2.auth.schema.get("flow") === "authorizationCode" ||
+          oauth2.auth.schema.get("flow") === "authorization_code"
        ) && !oauth2.auth.code) {
            if (!isValid) {
                oauth2.errCb({
                    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."
                });
            }

@@ -48,7 +47,7 @@
                oauth2.auth.code = qp.code;
                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
            } else {
-                let oauthErrorMsg
+                let oauthErrorMsg;
                if (qp.error) {
                    oauthErrorMsg = "["+qp.error+"]: " +
                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
@@ -59,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 {
@@ -68,7 +67,13 @@
        window.close();
    }

-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
+</body>
+</html>
@@ -0,0 +1,20 @@
+window.onload = function() {
+  //<editor-fold desc="Changeable Configuration Block">
+
+  // the following lines will be replaced by docker/configurator, when it runs in a docker-container
+  window.ui = SwaggerUIBundle({
+    url: "https://petstore.swagger.io/v2/swagger.json",
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  });
+
+  //</editor-fold>
+};