bumped the swagger-ui

TUM-Dev · Sep 13, 2023 · dab92fd · dab92fd
1 parent 5496f55
commit dab92fd
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 45 deletions.
diff --git a/server/swagger/fav.png b/server/swagger/fav.png
diff --git a/server/swagger/favicon-16x16.png b/server/swagger/favicon-16x16.png
diff --git a/server/swagger/favicon-32x32.png b/server/swagger/favicon-32x32.png
diff --git a/server/swagger/index.html b/server/swagger/index.html
@@ -5,55 +5,26 @@
     <meta charset="UTF-8">
     <title>Swagger UI</title>
     <link rel="stylesheet" type="text/css" href="./swagger-ui.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;
-      }
+    <link rel="icon" href="fav.png">
 
-      *,
-      *: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() {
-      // Begin Swagger UI call region
-      const ui = SwaggerUIBundle({
+      window.ui = SwaggerUIBundle({
         url: "./swagger.json",
         dom_id: '#swagger-ui',
         deepLinking: true,
         presets: [
-          SwaggerUIBundle.presets.apis,
-          SwaggerUIStandalonePreset
+          SwaggerUIBundle.presets.apis
         ],
         plugins: [
           SwaggerUIBundle.plugins.DownloadUrl
         ],
-        layout: "StandaloneLayout"
+        layout: "BaseLayout"
       });
-      // End Swagger UI call region
-
-      window.ui = ui;
     };
   </script>
   </body>

diff --git a/server/swagger/oauth2-redirect.html b/server/swagger/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 {
@@ -67,9 +67,13 @@
         window.close();
     }
 
-    window.addEventListener('DOMContentLoaded', function () {
-      run();
-    });
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
 </body>
 </html>
diff --git a/server/swagger/swagger-ui-bundle.js b/server/swagger/swagger-ui-bundle.js
diff --git a/server/swagger/swagger-ui-bundle.js.map b/server/swagger/swagger-ui-bundle.js.map
diff --git a/server/swagger/swagger-ui-standalone-preset.js b/server/swagger/swagger-ui-standalone-preset.js
diff --git a/server/swagger/swagger-ui.css b/server/swagger/swagger-ui.css
diff --git a/server/swagger/swagger-ui.css.map b/server/swagger/swagger-ui.css.map
diff --git a/server/swagger/update_swagger-ui.sh b/server/swagger/update_swagger-ui.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/sh
+
+echo updating the swagger-ui
+pnpm i swagger-ui
+
+rsync node_modules/swagger-ui/dist/oauth2-redirect.html .
+rsync node_modules/swagger-ui/dist/swagger-ui-bundle.js .
+rsync node_modules/swagger-ui/dist/swagger-ui-bundle.js.map .
+rsync node_modules/swagger-ui/dist/swagger-ui.css .
+rsync node_modules/swagger-ui/dist/swagger-ui.css.map .
+
+echo cleaning up temporary files
+rm -fr node_modules
+rm -fr package*.json
+
+echo updating the favicon
+curl https://www.tum.app/assets/img/fav.png --output fav.png
+