Merge branch 'alex/swagger-ui3' of https://github.com/Alexei-Kornienk…

…o/aiohttp-swagger into Alexei-Kornienko-alex/swagger-ui3
cr0hn · Nov 28, 2019 · 066d800 · 066d800
2 parents a749d4b + dacb786
commit 066d800
Show file tree

Hide file tree

Showing 14 changed files with 263 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,7 @@
 include LICENSE CHANGELOG README.md requirements.txt requirements-performance.txt
 recursive-include aiohttp_swagger/templates *
 recursive-include aiohttp_swagger/swagger_ui *
+recursive-include aiohttp_swagger/swagger_ui3 *
 
 recursive-exclude * __pycache__
 recursive-exclude * *.pyc

diff --git a/aiohttp_swagger/__init__.py b/aiohttp_swagger/__init__.py
@@ -30,9 +30,6 @@ async def _swagger_def(request):
     return web.json_response(text=request.app["SWAGGER_DEF_CONTENT"])
 
 
-STATIC_PATH = abspath(join(dirname(__file__), "swagger_ui"))
-
-
 def setup_swagger(app: web.Application,
                   *,
                   swagger_from_file: str = None,
@@ -41,6 +38,7 @@ def setup_swagger(app: web.Application,
                   swagger_validator_url: str = "",
                   description: str = "Swagger API definition",
                   api_version: str = "1.0.0",
+                  ui_version: int = None,
                   title: str = "Swagger API",
                   contact: str = "",
                   swagger_home_decor: FunctionType = None,
@@ -55,6 +53,11 @@ def setup_swagger(app: web.Application,
     _base_swagger_url = _swagger_url.rstrip('/')
     _swagger_def_url = '{}/swagger.json'.format(_base_swagger_url)
 
+    if ui_version == 3:
+        STATIC_PATH = abspath(join(dirname(__file__), "swagger_ui3"))
+    else:
+        STATIC_PATH = abspath(join(dirname(__file__), "swagger_ui"))
+
     # Build Swagget Info
     if swagger_info is None:
         if swagger_from_file:

diff --git a/aiohttp_swagger/swagger_ui3/favicon-16x16.png b/aiohttp_swagger/swagger_ui3/favicon-16x16.png
diff --git a/aiohttp_swagger/swagger_ui3/favicon-32x32.png b/aiohttp_swagger/swagger_ui3/favicon-32x32.png
diff --git a/aiohttp_swagger/swagger_ui3/index.html b/aiohttp_swagger/swagger_ui3/index.html
@@ -0,0 +1,60 @@
+<!-- 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="##STATIC_PATH##/swagger-ui.css" >
+    <link rel="icon" type="image/png" href="##STATIC_PATH##/favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="##STATIC_PATH##/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="##STATIC_PATH##/swagger-ui-bundle.js"> </script>
+    <script src="##STATIC_PATH##/swagger-ui-standalone-preset.js"> </script>
+    <script>
+    window.onload = function() {
+      // Begin Swagger UI call region
+      const ui = SwaggerUIBundle({
+        url: "##SWAGGER_CONFIG##",
+        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>
+  </body>
+</html>
diff --git a/aiohttp_swagger/swagger_ui3/oauth2-redirect.html b/aiohttp_swagger/swagger_ui3/oauth2-redirect.html
@@ -0,0 +1,67 @@
+<!doctype html>
+<html lang="en-US">
+<body onload="run()">
+</body>
+</html>
+<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);
+        } 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.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"
+                });
+            }
+
+            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();
+    }
+</script>
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui-bundle.js b/aiohttp_swagger/swagger_ui3/swagger-ui-bundle.js
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui-bundle.js.map b/aiohttp_swagger/swagger_ui3/swagger-ui-bundle.js.map
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui-standalone-preset.js b/aiohttp_swagger/swagger_ui3/swagger-ui-standalone-preset.js
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui-standalone-preset.js.map b/aiohttp_swagger/swagger_ui3/swagger-ui-standalone-preset.js.map
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui.css b/aiohttp_swagger/swagger_ui3/swagger-ui.css
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui.css.map b/aiohttp_swagger/swagger_ui3/swagger-ui.css.map
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui.js b/aiohttp_swagger/swagger_ui3/swagger-ui.js
diff --git a/aiohttp_swagger/swagger_ui3/swagger-ui.js.map b/aiohttp_swagger/swagger_ui3/swagger-ui.js.map