upgrade swagger UI 3.22.0 -> 3.45.1

* feat: update Swagger UI * fix: update oas3 car example * fix: restore configUrl from ui/index.html * feat: add README for ui folder
sanic-org · Mar 28, 2021 · 2c731ec · 2c731ec
1 parent 0f8631f
commit 2c731ec
Show file tree

Hide file tree

Showing 17 changed files with 53 additions and 138 deletions.
diff --git a/examples/cars_oas3/main.py b/examples/cars_oas3/main.py
@@ -5,7 +5,7 @@
 from blueprints.repair import blueprint as repair_blueprint
 from sanic import Sanic
 
-from sanic_openapi import oas3_blueprint
+from sanic_openapi import openapi3_blueprint
 
 app = Sanic("Cars API example")
 
@@ -15,7 +15,7 @@
 app.blueprint(manufacturer_blueprint)
 app.blueprint(repair_blueprint)
 
-app.blueprint(oas3_blueprint)
+app.blueprint(openapi3_blueprint)
 
 app.config.API_VERSION = '1.0.0'
 app.config.API_TITLE = 'Car API'

diff --git a/sanic_openapi/ui/README.md b/sanic_openapi/ui/README.md
@@ -0,0 +1,6 @@
+# Swagger UI v3.45.1
+
+[Swagger UI](https://swagger.io/tools/swagger-ui/) allows anyone — be it your development team or your end consumers — to visualize and interact with the API’s resources without having any of the implementation logic in place. It’s automatically generated from your OpenAPI (formerly known as Swagger) Specification, with the visual documentation making it easy for back end implementation and client side consumption.
+
+## License 
+Swagger UI is licensed under the Apache License 2.0
diff --git a/sanic_openapi/ui/index.html b/sanic_openapi/ui/index.html
@@ -4,7 +4,7 @@
   <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="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
     <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
     <style>
@@ -33,8 +33,8 @@
   <body>
     <div id="swagger-ui"></div>
 
-    <script src="./swagger-ui-bundle.js"> </script>
-    <script src="./swagger-ui-standalone-preset.js"> </script>
+    <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
@@ -51,11 +51,11 @@
           SwaggerUIBundle.plugins.DownloadUrl
         ],
         layout: "StandaloneLayout"
-      })
+      });
       // End Swagger UI call region
 
-      window.ui = ui
-    }
+      window.ui = ui;
+    };
   </script>
   </body>
 </html>
diff --git a/sanic_openapi/ui/oauth2-redirect.html b/sanic_openapi/ui/oauth2-redirect.html
@@ -1,8 +1,9 @@
 <!doctype html>
 <html lang="en-US">
-<body onload="run()">
-</body>
-</html>
+<head>
+    <title>Swagger UI: OAuth2 Redirect</title>
+</head>
+<body>
 <script>
     'use strict';
     function run () {
@@ -17,19 +18,20 @@
             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({
@@ -45,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. ") +
@@ -64,4 +66,10 @@
         }
         window.close();
     }
+
+    window.addEventListener('DOMContentLoaded', function () {
+      run();
+    });
 </script>
+</body>
+</html>
diff --git a/sanic_openapi/ui/swagger-ui-bundle.js b/sanic_openapi/ui/swagger-ui-bundle.js
diff --git a/sanic_openapi/ui/swagger-ui-bundle.js.map b/sanic_openapi/ui/swagger-ui-bundle.js.map
diff --git a/sanic_openapi/ui/swagger-ui-es-bundle-core.js b/sanic_openapi/ui/swagger-ui-es-bundle-core.js
diff --git a/sanic_openapi/ui/swagger-ui-es-bundle-core.js.map b/sanic_openapi/ui/swagger-ui-es-bundle-core.js.map
diff --git a/sanic_openapi/ui/swagger-ui-es-bundle.js b/sanic_openapi/ui/swagger-ui-es-bundle.js
diff --git a/sanic_openapi/ui/swagger-ui-es-bundle.js.map b/sanic_openapi/ui/swagger-ui-es-bundle.js.map
diff --git a/sanic_openapi/ui/swagger-ui-standalone-preset.js b/sanic_openapi/ui/swagger-ui-standalone-preset.js
diff --git a/sanic_openapi/ui/swagger-ui-standalone-preset.js.map b/sanic_openapi/ui/swagger-ui-standalone-preset.js.map
diff --git a/sanic_openapi/ui/swagger-ui.css b/sanic_openapi/ui/swagger-ui.css
diff --git a/sanic_openapi/ui/swagger-ui.css.map b/sanic_openapi/ui/swagger-ui.css.map
diff --git a/sanic_openapi/ui/swagger-ui.js b/sanic_openapi/ui/swagger-ui.js
diff --git a/sanic_openapi/ui/swagger-ui.js.map b/sanic_openapi/ui/swagger-ui.js.map
diff --git a/sanic_openapi/ui/version b/sanic_openapi/ui/version