AER-2570 openapi/swagger-ui changes (#44)

* Latest swagger-ui version (v5.10.5), the dist folder. Changes wrt the actual dist folder: copied swagger-ui/index.html to swagger-ui.html (as it was), and changed url in swagger-initializer.js to 'openapi.yaml'. Rest is as-is. * Renamed api.yaml to openapi.yaml: this is the recommended name according to https://swagger.io/specification/ (and something that developer.overheid.nl checks for, should we add this service on there once released)
aerius · Dec 22, 2023 · d03e15c · d03e15c
1 parent 4ecf742
commit d03e15c
Show file tree

Hide file tree

Showing 21 changed files with 153 additions and 60 deletions.
diff --git a/source/rest-service/pom.xml b/source/rest-service/pom.xml
@@ -186,7 +186,7 @@
             <configuration>
               <skip>${maven.main.skip}</skip>
               <!-- Location of our openapi specification file -->
-              <inputSpec>${project.basedir}/src/main/resources/static/api.yaml</inputSpec>
+              <inputSpec>${project.basedir}/src/main/resources/static/openapi.yaml</inputSpec>
               <!-- Type of code to generate -->
               <generatorName>spring</generatorName>
               <!-- Location where generated code should end up -->

diff --git a/...ervice/src/main/resources/static/api.yaml → ...ce/src/main/resources/static/openapi.yaml b/...ervice/src/main/resources/static/api.yaml → ...ce/src/main/resources/static/openapi.yaml
diff --git a/source/rest-service/src/main/resources/static/swagger-ui.html b/source/rest-service/src/main/resources/static/swagger-ui.html
@@ -1,58 +1,19 @@
 <!-- HTML for static distribution bundle build -->
 <!DOCTYPE html>
-<html lang="nl">
+<html lang="en">
   <head>
     <meta charset="UTF-8">
     <title>Swagger UI</title>
-    <link rel="stylesheet" type="text/css" href="./swagger-ui/swagger-ui.css" >
-    <style>
-      html
-      {
-        box-sizing: border-box;
-        overflow: -moz-scrollbars-vertical;
-        overflow-y: scroll;
-      }
-
-      *,
-      *:before,
-      *:after
-      {
-        box-sizing: inherit;
-      }
-
-      body
-      {
-        margin:0;
-        background: #fafafa;
-      }
-    </style>
+    <link rel="stylesheet" type="text/css" href="./swagger-ui/swagger-ui.css" />
+    <link rel="stylesheet" type="text/css" href="./swagger-ui/index.css" />
+    <link rel="icon" type="image/png" href="./swagger-ui/favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./swagger-ui/favicon-16x16.png" sizes="16x16" />
   </head>
 
   <body>
     <div id="swagger-ui"></div>
-
     <script src="./swagger-ui/swagger-ui-bundle.js" charset="UTF-8"> </script>
     <script src="./swagger-ui/swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
-    <script>
-    window.onload = function() {
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
-        url: "api.yaml",
-        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-ui/swagger-initializer.js" charset="UTF-8"> </script>
   </body>
 </html>
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/favicon-16x16.png b/source/rest-service/src/main/resources/static/swagger-ui/favicon-16x16.png
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/favicon-32x32.png b/source/rest-service/src/main/resources/static/swagger-ui/favicon-32x32.png
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/index.css b/source/rest-service/src/main/resources/static/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/source/rest-service/src/main/resources/static/swagger-ui/index.html b/source/rest-service/src/main/resources/static/swagger-ui/index.html
@@ -0,0 +1,19 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+  <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="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" />
+  </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 src="./swagger-initializer.js" charset="UTF-8"> </script>
+  </body>
+</html>
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/oauth2-redirect.html b/source/rest-service/src/main/resources/static/swagger-ui/oauth2-redirect.html
@@ -0,0 +1,79 @@
+<!doctype html>
+<html lang="en-US">
+<head>
+    <title>Swagger UI: OAuth2 Redirect</title>
+</head>
+<body>
+<script>
+    'use strict';
+    function run () {
+        var oauth2 = window.opener.swaggerUIRedirectOauth2;
+        var sentState = oauth2.state;
+        var redirectUrl = oauth2.redirectUrl;
+        var isValid, qp, arr;
+
+        if (/code|token|error/.test(window.location.hash)) {
+            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('=', '":"') + '"';});
+        qp = qp ? JSON.parse('{' + arr.join() + '}',
+                function (key, value) {
+                    return key === "" ? value : decodeURIComponent(value);
+                }
+        ) : {};
+
+        isValid = qp.state === sentState;
+
+        if ((
+          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. The passed state wasn't returned from auth server."
+                });
+            }
+
+            if (qp.code) {
+                delete oauth2.state;
+                oauth2.auth.code = qp.code;
+                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
+            } else {
+                let oauthErrorMsg;
+                if (qp.error) {
+                    oauthErrorMsg = "["+qp.error+"]: " +
+                        (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
+                        (qp.error_uri ? "More info: "+qp.error_uri : "");
+                }
+
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "error",
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
+                });
+            }
+        } else {
+            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
+        }
+        window.close();
+    }
+
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
+</script>
+</body>
+</html>
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-initializer.js b/source/rest-service/src/main/resources/static/swagger-ui/swagger-initializer.js
@@ -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: "openapi.yaml",
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  });
+
+  //</editor-fold>
+};
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-bundle.js b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-bundle.js
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-bundle.js.map b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-bundle.js.map
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle-core.js b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle-core.js
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle-core.js.map b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle-core.js.map
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle.js b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle.js
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle.js.map b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-es-bundle.js.map
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js.map b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui-standalone-preset.js.map
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.css b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.css
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.css.map b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.css.map
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.js b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.js
diff --git a/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.js.map b/source/rest-service/src/main/resources/static/swagger-ui/swagger-ui.js.map