disable url parameter in swagger-ui page (backport #11202) (#11207)

* disable url parameter in swagger-ui page (#11202) Closes: #11201 Solution: - update swagger-ui to recent release - add option `queryConfigEnabled: false` (cherry picked from commit cb6fea9) # Conflicts: # client/docs/statik/statik.go # client/docs/swagger-ui/swagger-ui-bundle.js # client/docs/swagger-ui/swagger-ui-bundle.js.map # client/docs/swagger-ui/swagger-ui-es-bundle-core.js # client/docs/swagger-ui/swagger-ui-es-bundle-core.js.map # client/docs/swagger-ui/swagger-ui-es-bundle.js # client/docs/swagger-ui/swagger-ui-es-bundle.js.map # client/docs/swagger-ui/swagger-ui-standalone-preset.js # client/docs/swagger-ui/swagger-ui-standalone-preset.js.map # client/docs/swagger-ui/swagger-ui.js # client/docs/swagger-ui/swagger-ui.js.map * fix conflicts * override swagger-ui after resolve conflicts Co-authored-by: yihuang <[email protected]> Co-authored-by: marbar3778 <[email protected]>
cosmos · Feb 21, 2022 · 4368a18 · 4368a18
1 parent 7f949c0
commit 4368a18
Show file tree

Hide file tree

Showing 18 changed files with 46 additions and 54,962 deletions.
diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/client/docs/swagger-ui/favicon-16x16.png b/client/docs/swagger-ui/favicon-16x16.png
diff --git a/client/docs/swagger-ui/favicon-32x32.png b/client/docs/swagger-ui/favicon-32x32.png
diff --git a/client/docs/swagger-ui/index.html b/client/docs/swagger-ui/index.html
@@ -43,6 +43,7 @@
         url: "./swagger.yaml",
         dom_id: '#swagger-ui',
         deepLinking: true,
+        queryConfigEnabled: false,
         presets: [
           SwaggerUIBundle.presets.apis,
           SwaggerUIStandalonePreset

diff --git a/client/docs/swagger-ui/oauth2-redirect.html b/client/docs/swagger-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>