Skip to content

Commit 3a8839e

Browse files
jgongdjgongd
committed
chore: upgrade swagger-ui to v5.20.0 (#10250)
Upgrade to fix a vulnerability in the Try-it-out feature: GHSA-qrmm-w75w-3wpx We've chosen the SwaggerUI standalone installation that doesn't require npm: https://github.com/swagger-api/swagger-ui/blob/80d56c9518af7ad523f7171815c9da836551e259/docs/usage/installation.md#plain-old-htmlcssjs-standalone
1 parent af0a6f7 commit 3a8839e

16 files changed

+41
-46
lines changed

‎docs/swagger-ui/index.css

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
html {
2+
box-sizing: border-box;
3+
overflow: -moz-scrollbars-vertical;
4+
overflow-y: scroll;
5+
}
6+
7+
*,
8+
*:before,
9+
*:after {
10+
box-sizing: inherit;
11+
}
12+
13+
body {
14+
margin: 0;
15+
background: #fafafa;
16+
}

‎docs/swagger-ui/index.html

+2-22
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,13 @@
55
<meta charset="UTF-8">
66
<title>Swagger UI</title>
77
<link rel="stylesheet" type="text/css" href="./swagger-ui.css" />
8+
<link rel="stylesheet" type="text/css" href="index.css" />
89
<link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
910
<link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
10-
<style>
11-
html
12-
{
13-
box-sizing: border-box;
14-
overflow: -moz-scrollbars-vertical;
15-
overflow-y: scroll;
16-
}
17-
18-
*,
19-
*:before,
20-
*:after
21-
{
22-
box-sizing: inherit;
23-
}
24-
25-
body
26-
{
27-
margin:0;
28-
background: #fafafa;
29-
}
30-
</style>
3111
</head>
12+
3213
<body>
3314
<div id="swagger-ui"></div>
34-
3515
<script src="./swagger-ui-bundle.js" charset="UTF-8"> </script>
3616
<script src="./swagger-ui-standalone-preset.js" charset="UTF-8"> </script>
3717
<script src="./swagger-ui-main.js" charset="UTF-8"> </script>

‎docs/swagger-ui/oauth2-redirect.html

+10-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
var isValid, qp, arr;
1414

1515
if (/code|token|error/.test(window.location.hash)) {
16-
qp = window.location.hash.substring(1);
16+
qp = window.location.hash.substring(1).replace('?', '&');
1717
} else {
1818
qp = location.search.substring(1);
1919
}
@@ -38,7 +38,7 @@
3838
authId: oauth2.auth.name,
3939
source: "auth",
4040
level: "warning",
41-
message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
41+
message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
4242
});
4343
}
4444

@@ -58,7 +58,7 @@
5858
authId: oauth2.auth.name,
5959
source: "auth",
6060
level: "error",
61-
message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
61+
message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
6262
});
6363
}
6464
} else {
@@ -67,9 +67,13 @@
6767
window.close();
6868
}
6969

70-
window.addEventListener('DOMContentLoaded', function () {
71-
run();
72-
});
70+
if (document.readyState !== 'loading') {
71+
run();
72+
} else {
73+
document.addEventListener('DOMContentLoaded', function () {
74+
run();
75+
});
76+
}
7377
</script>
7478
</body>
7579
</html>

‎docs/swagger-ui/swagger-ui-bundle.js

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui-bundle.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui-es-bundle-core.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui-es-bundle-core.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui-es-bundle.js

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui-es-bundle.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui-main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
window.onload = function() {
22
// Begin Swagger UI call region
33
const ui = SwaggerUIBundle({
4-
url: '/api/v1/api.swagger.json',
4+
url: 'api.swagger.json',
55
dom_id: '#swagger-ui',
66
deepLinking: true,
77
presets: [

‎docs/swagger-ui/swagger-ui-standalone-preset.js

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui-standalone-preset.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui.css

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui.css.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui.js

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/swagger-ui/swagger-ui.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)